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

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)