aboutsummaryrefslogtreecommitdiffstats
path: root/URPM.xs
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2008-06-17 09:38:36 +0000
committerPascal Rigaux <pixel@mandriva.com>2008-06-17 09:38:36 +0000
commit857ba834a4f744ecd9dae9f0ea54148e0a8c821f (patch)
treed704e3ed1a4b1d470f7ea5aa4e69eccc1f8c6092 /URPM.xs
parent47cb6d56109c4034cc46f9df3273f8fef876c31b (diff)
downloadperl-URPM-857ba834a4f744ecd9dae9f0ea54148e0a8c821f.tar
perl-URPM-857ba834a4f744ecd9dae9f0ea54148e0a8c821f.tar.gz
perl-URPM-857ba834a4f744ecd9dae9f0ea54148e0a8c821f.tar.bz2
perl-URPM-857ba834a4f744ecd9dae9f0ea54148e0a8c821f.tar.xz
perl-URPM-857ba834a4f744ecd9dae9f0ea54148e0a8c821f.zip
- fix urpmi wrongly considering epochless conflicts to match any epoch in a
case when urpmi should upgrade a conflicting package to an actually non-conflicting version (cf epochless-conflict-with-promotion urpmi test) from Anssi. i tested various upgrades from some chroot with 2008.0, 2007.1, 2007.0, and it didn't change the result, so it should be quite safe :)
Diffstat (limited to 'URPM.xs')
-rw-r--r--URPM.xs3
1 files changed, 2 insertions, 1 deletions
diff --git a/URPM.xs b/URPM.xs
index df5cd0c..29d4078 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -1917,8 +1917,9 @@ Pkg_compare(pkg, evr)
compare = _epoch - (*epoch ? atoi(epoch) : 0);
version[-1] = ':'; /* restore in memory modification */
} else {
- /* there is no epoch defined, so no check on epoch and assume equality */
+ /* there is no epoch defined, so assume epoch = 0 */
version = evr;
+ compare = _epoch;
}
if (!compare) {
if (!pkg->info)