[yum-commits] 2 commits - yum/rpmsack.py

James Antill james at osuosl.org
Thu Oct 25 20:16:14 UTC 2012


 yum/rpmsack.py |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit eb021127538e6f84727df154d52c29d475cacb4e
Merge: bf106ce 64f26fa
Author: James Antill <james at and.org>
Date:   Thu Oct 25 16:16:12 2012 -0400

    Merge branch 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum
    
    * 'master' of ssh://yum.baseurl.org/srv/projects/yum/git/yum: (7 commits)
      Enable background downloading
      ...

commit bf106ce30a198f32f43d14041d808b60f9e6719e
Author: James Antill <james at and.org>
Date:   Thu Oct 25 16:15:45 2012 -0400

    Fix epoch matching for nevra on installed packages, epoch_num ftw.

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index 302f613..4e26d51 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -581,7 +581,7 @@ class RPMDBPackageSack(PackageSackBase):
             if repat(epoch + ":%(name)s-%(version)s-%(release)s.%(arch)s"
                            % hdr):
                 return True
-            if repat("%(name)s-%(epoch)s:%(version)s-%(release)s.%(arch)s"
+            if repat(("%(name)s-" + epoch + ":%(version)s-%(release)s.%(arch)s")
                            % hdr):
                 return True
         return False


More information about the Yum-commits mailing list