sinjuginas/rpm-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

define _upgrade_honor_buildtime to 1 by default, add --ignorebuildtime to disable

Browse Source
This commit is contained in:
Дмитрий Левин 2005-10-18 10:43:12 +00:00
parent a4397f4c4a
commit 6e6ebb00f1
4 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/psm.c
View File

@ -40,7 +40,7 @@ static int upgrade_honor_buildtime(void)
static int honor_buildtime = -1; static int honor_buildtime = -1;
if (honor_buildtime < 0) if (honor_buildtime < 0)
honor_buildtime = rpmExpandNumeric("%{?_upgrade_honor_buildtime}") ? 1 : 0; honor_buildtime = rpmExpandNumeric("%{?_upgrade_honor_buildtime}%{?!_upgrade_honor_buildtime:1}") ? 1 : 0;
return honor_buildtime; return honor_buildtime;
} }

2
lib/transaction.c
View File

@ -1521,7 +1521,7 @@ static int upgrade_honor_buildtime(void)
static int honor_buildtime = -1; static int honor_buildtime = -1;
if (honor_buildtime < 0) if (honor_buildtime < 0)
honor_buildtime = rpmExpandNumeric("%{?_upgrade_honor_buildtime}") ? 1 : 0; honor_buildtime = rpmExpandNumeric("%{?_upgrade_honor_buildtime}%{?!_upgrade_honor_buildtime:1}") ? 1 : 0;
return honor_buildtime; return honor_buildtime;
} }

4
rpm-4_0.spec
View File

@ -534,8 +534,8 @@ fi
- Backported epoch handling fix to package upgrade algorithm. - Backported epoch handling fix to package upgrade algorithm.
- Backported my own changes to the package upgrade algorithm: - Backported my own changes to the package upgrade algorithm:
+ Remove old files on "-U --force" even if package NEVRs match. + Remove old files on "-U --force" even if package NEVRs match.
+ When comparing package versions on -U or -F, optionally + When comparing package versions on -U or -F, take
take build dates into account. build dates into account.
* Thu Oct 13 2005 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt51 * Thu Oct 13 2005 Dmitry V. Levin <ldv@altlinux.org> 4.0.4-alt51
- rpmio/macro.c, build/parseSpec: - rpmio/macro.c, build/parseSpec:

2
rpmpopt.in
View File

@ -205,6 +205,7 @@ rpm alias --vendor --eval %vendor
rpm alias --packager --eval %packager rpm alias --packager --eval %packager
rpm alias --distribution --eval %distribution rpm alias --distribution --eval %distribution
rpm alias --nowait-lock --define '_wait_for_lock 0' rpm alias --nowait-lock --define '_wait_for_lock 0'
rpm alias --ignorebuildtime --define '_upgrade_honor_buildtime 0'
#============================================================================== #==============================================================================
rpmb alias --dbpath --define '_dbpath !#:+' \ rpmb alias --dbpath --define '_dbpath !#:+' \
--POPTdesc=$"use <dir> as the directory for the database" \ --POPTdesc=$"use <dir> as the directory for the database" \
@ -281,6 +282,7 @@ rpmi alias --ftpport --define '_ftpport !#:+'
rpmi alias --ftpproxy --define '_ftpproxy !#:+' rpmi alias --ftpproxy --define '_ftpproxy !#:+'
rpmi alias --httpport --define '_httpport !#:+' rpmi alias --httpport --define '_httpport !#:+'
rpmi alias --httpproxy --define '_httpproxy !#:+' rpmi alias --httpproxy --define '_httpproxy !#:+'
rpmi alias --ignorebuildtime --define '_upgrade_honor_buildtime 0'
#============================================================================== #==============================================================================
rpmk alias --dbpath --define '_dbpath !#:+' \ rpmk alias --dbpath --define '_dbpath !#:+' \
--POPTdesc=$"use <dir> as the directory for the database" \ --POPTdesc=$"use <dir> as the directory for the database" \