[yum-cvs] yum/yum sqlitesack.py,1.14,1.15

[Gijs Hollestelle]

Update of /home/groups/yum/cvs/yum/yum
In directory login:/tmp/cvs-serv29380

Modified Files:
	sqlitesack.py 
Log Message:
Apply a patch by Panu Matilainen, fixing getPrco returning empty sets and 
a bug triggered by files that have no dirname (such specs in as SRPMS).



Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sqlitesack.py	9 Mar 2005 16:03:52 -0000	1.14
+++ sqlitesack.py	10 Mar 2005 14:56:28 -0000	1.15
@@ -135,11 +135,10 @@
         return result
 
     def getPrco(self, pkgId):
-        result = {}
+        result = {'requires': [], 'provides': [], 'obsoletes': [], 'conflicts': []}
         for (rep, cache) in self.primarydb.items():
             cur = cache.cursor()
-            for prco in ['requires', 'provides', 'obsoletes', 'conflicts']:
-                result[prco] = []
+            for prco in result.keys():
                 cur.execute("select * from packages,%s where packages.pkgId = %s and packages.pkgKey = %s.pkgKey", prco, pkgId, prco)
                 for ob in cur.fetchall():
                     name = ob['%s.name' % prco ]
@@ -163,7 +162,10 @@
                 filetypes = decodefiletypelist(ob['filelist.filetypes'])
                 filenames = decodefilenamelist(ob['filelist.filenames'])
                 while(filenames):
-                    filename = dirname+'/'+filenames.pop()
+                    if dirname:
+                        filename = dirname+'/'+filenames.pop()
+                    else:
+                        filename = filenames.pop()
                     filetype = filetypes.pop()
                     result.setdefault(filetype,[]).append(filename)
             if (found):