[yum-cvs] yum/yum sqlitesack.py,1.87,1.88

[Jeremy Katz]

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

Modified Files:
	sqlitesack.py 
Log Message:
fix filelist/dirlist population to be correct!

we've been doing sort/uniq on the filenames which makes (illustrative example..)
 /lib dff|dbus-1.0/lidbus-1.so.3.2.0/libdbus-1.so.3
end up giving
 /lib/libdbus-1.so.3 (dir)
 /lib/libdbus-1.so.3.2.0 (file)
 /lib/dbus-1.0 (file)

This is clearly *not* what it's supposed to be :)


Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.87
retrieving revision 1.88
diff -u -r1.87 -r1.88
--- sqlitesack.py	9 Mar 2007 17:05:57 -0000	1.87
+++ sqlitesack.py	29 Mar 2007 21:57:36 -0000	1.88
@@ -35,7 +35,6 @@
 
 class YumAvailablePackageSqlite(YumAvailablePackage, PackageObject, RpmBase):
     def __init__(self, repo, db_obj):
-        
         self._checksums = []
         self.prco = { 'obsoletes': [],
                       'conflicts': [],
@@ -109,7 +108,7 @@
     def _loadFiles(self):
         if self._loadedfiles:
             return self._files
-        
+
         result = {}
         
         #FIXME - this should be try, excepting
@@ -134,7 +133,7 @@
                 result.setdefault(filetype,[]).append(filename)
         self._loadedfiles = True
         self._files = result
-        
+
         return self._files
 
     def _loadChangelog(self):
@@ -204,7 +203,7 @@
         self.filelistsdb = {}
         self.otherdb = {}
         self.excludes = {}
-        
+
     def __len__(self):
         for (rep,cache) in self.primarydb.items():
             cur = cache.cursor()
@@ -712,7 +711,7 @@
 
 # Return a list representing filestring (filenames can not contain /)
 def decodefilenamelist(filenamestring):
-    return misc.unique(filenamestring.split('/'))
+    return filenamestring.split('/')
 
 # Return a string representing filetypeslist
 # filetypes should be file, dir or ghost