[yum-cvs] yum/yum packages.py,1.69,1.70

Jeremy Katz katzj at linux.duke.edu
Mon Sep 18 20:06:09 UTC 2006


Update of /home/groups/yum/cvs/yum/yum
In directory login1.linux.duke.edu:/tmp/cvs-serv3827/yum

Modified Files:
	packages.py 
Log Message:
fix dep installs for locales like turkish where 
string.lower("I") != "i" (rh#206853)


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- packages.py	13 Sep 2006 22:37:46 -0000	1.69
+++ packages.py	18 Sep 2006 20:06:07 -0000	1.70
@@ -585,7 +585,11 @@
     def _populatePrco(self):
         "Populate the package object with the needed PRCO interface."
 
-        for tag in ['OBSOLETE', 'CONFLICT', 'REQUIRE', 'PROVIDE']:
+        tag2prco = { "OBSOLETE": "obsoletes",
+                     "CONFLICT": "conflicts",
+                     "REQUIRE": "requires",
+                     "PROVIDE": "provides" }
+        for tag in tag2prco.keys():
             name = self.hdr[getattr(rpm, 'RPMTAG_%sNAME' % tag)]
 
             lst = self.hdr[getattr(rpm, 'RPMTAG_%sFLAGS' % tag)]
@@ -600,7 +604,7 @@
                 value = rpmUtils.miscutils.stringToVersion(i)
                 vers.append(value)
 
-            prcotype = tag.lower() + 's'
+            prcotype = tag2prco[tag]
             if name is not None:
                 self.prco[prcotype] = zip(name, flag, vers)
     




More information about the Yum-cvs-commits mailing list