Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavier Chantry <chantry.xavier@gmail.com>2010-10-14 21:50:19 +0200
committerDan McGee <dan@archlinux.org>2010-12-12 19:45:04 -0600
commit5c8083baa4a831b16adcc3c1c35d7438f5bdcc3e (patch)
tree73eb80efb7baef9ef222399d3e8413351a0afa9f
parenteedf4f4e630f98350090ef2824b0981ffb4b7a4a (diff)
be_files: write EPOCH instead of FORCE
This patch is only meant for 3.4.x. It prepares the place for the future epoch-aware release. All force packages that get reinstalled or upgraded will get an EPOCH entry in the local database, and thus the new pacman with epoch won't reinstall them by mistake on the first -Su. Signed-off-by: Xavier Chantry <chantry.xavier@gmail.com> Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--lib/libalpm/be_files.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libalpm/be_files.c b/lib/libalpm/be_files.c
index 877bc505..c0b8b439 100644
--- a/lib/libalpm/be_files.c
+++ b/lib/libalpm/be_files.c
@@ -810,10 +810,11 @@ int _alpm_db_write(pmdb_t *db, pmpkg_t *info, pmdbinfrq_t inforeq)
}
fprintf(fp, "\n");
}
- if(info->force) {
- fprintf(fp, "%%FORCE%%\n\n");
- }
if(local) {
+ if(info->force) {
+ fprintf(fp, "%%EPOCH%%\n"
+ "1\n\n");
+ }
if(info->url) {
fprintf(fp, "%%URL%%\n"
"%s\n\n", info->url);