[yum-cvs] /yum-utils/plugins/priorities priorities.py,1.1,1.1.2.1

[Tim Lauridsen]

Update of /home/groups/yum/cvs//yum-utils/plugins/priorities
In directory login1.linux.duke.edu:/tmp/cvs-serv27237/plugins/priorities

Modified Files:
      Tag: yum-utils-1_0_X
	priorities.py 
Log Message:
Make priorities plugin work with multiarch repositories with different repositories. (foo.i386  <> foo.x86_64)
rhbz #227540

Index: priorities.py
===================================================================
RCS file: /home/groups/yum/cvs//yum-utils/plugins/priorities/priorities.py,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -r1.1 -r1.1.2.1
--- priorities.py	27 Oct 2006 09:13:57 -0000	1.1
+++ priorities.py	19 Feb 2007 07:35:57 -0000	1.1.2.1
@@ -78,7 +78,8 @@
     for repo in allrepos:
         if repo.enabled:
             for po in conduit.getPackages(repo):
-                if pkg_priorities.has_key(po.name) and pkg_priorities[po.name] < repo.priority:
+                key = "%s.%s" % (po.name,po.arch)
+                if pkg_priorities.has_key(key) and pkg_priorities[key] < repo.priority:
                     conduit.delPackage(po)
                     cnt += 1
                     conduit.info(3," --> %s from %s excluded (priority)" % (po,po.repoid))
@@ -87,7 +88,8 @@
                     if obsoletes.has_key(po.pkgtup):
                         obsolete_pkgs = obsoletes[po.pkgtup]
                         for obsolete_pkg in obsolete_pkgs:
-                            if pkg_priorities.has_key(obsolete_pkg[0]) and pkg_priorities[obsolete_pkg[0]] < repo.priority:
+                            key = "%s.%s" % (obsolete_pkg[0],obsolete_pkg[1])        
+                            if pkg_priorities.has_key(key) and pkg_priorities[key] < repo.priority:
                                 conduit.delPackage(po)
                                 cnt += 1
                                 conduit.info(3," --> %s from %s excluded (priority)" % (po,po.repoid))
@@ -97,7 +99,8 @@
 def _pkglisttodict(pl, priority):
     out = {}
     for p in pl:
-        out[p.name] = priority
+        key = "%s.%s" % (p.name,p.arch)
+        out[key] = priority
     return out
 
 def _mergeprioritydicts(dict1, dict2):