- 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 :)

2 files changed, 6 insertions, 1 deletions

diff --git a/NEWS b/NEWS
index bc1a135..0a49c99 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+- 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)
+
 Version 3.14 - 23 May 2008, by Pascal "Pixel" Rigaux
 
 - add is_package_installed() in URPM/Resolve.pm
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)