From 9afc2f37e4bec021a184524b6de3512216c016d5 Mon Sep 17 00:00:00 2001 From: Denis Silakov Date: Mon, 1 Apr 2013 11:53:39 +0400 Subject: [PATCH] Fix incorrect epoch detection with --obsoletes option --- urpm-repomanage.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/urpm-repomanage.py b/urpm-repomanage.py index 6d277bb..5213dd0 100755 --- a/urpm-repomanage.py +++ b/urpm-repomanage.py @@ -210,9 +210,14 @@ def main(args): # Check OBSOLETEFLAGS and OBSOLETEVERSION - do we really satisfy them? really_obsoleted = 0; oef = obsolete_flags[n][idx] + oep = None if obsolete_vers[n][idx].find("-") >= 0: (over,orel) = obsolete_vers[n][idx].split("-"); + if orel.find(":") >= 0: + (orel,oep) = orel.split(":"); + else: + oep = None else: over = obsolete_vers[n][idx] orel = None @@ -222,10 +227,6 @@ def main(args): else: oep = None - if orel.find(":") >= 0: - (orel,oep) = orel.split(":"); - else: - oep = None # Ignore epochs for now ... rc = miscutils.compareEVR((0, v, r), (0, over, orel))