[yum-cvs] yum/yum sqlitesack.py,1.55,1.56

[James Bowes]

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

Modified Files:
	sqlitesack.py 
Log Message:
Make addDict on SqlitePackageSack behave more like the one on YumPackageSack

SqlitePackageSack used to store 'metadata' in added as 'primary', and only
kept the last type in added. Now it stores 'metadata' as 'metadata', and
appends to added.


Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -r1.55 -r1.56
--- sqlitesack.py	22 Jan 2007 04:33:22 -0000	1.55
+++ sqlitesack.py	28 Jan 2007 22:57:00 -0000	1.56
@@ -191,27 +191,27 @@
         self.excludes[repo][obj.pkgId] = 1
 
     def addDict(self, repo, datatype, dataobj, callback=None):
+        if self.added.has_key(repo):
+            if datatype in self.added[repo]:
+                return
+        else:
+            self.added[repo] = []
+
         if (not self.excludes.has_key(repo)): 
             self.excludes[repo] = {}
+
         if datatype == 'metadata':
-            if (self.primarydb.has_key(repo)):
-              return
-            self.added[repo] = ['primary']
             self.primarydb[repo] = dataobj
         elif datatype == 'filelists':
-            if (self.filelistsdb.has_key(repo)):
-              return
-            self.added[repo] = ['filelists']
             self.filelistsdb[repo] = dataobj
         elif datatype == 'otherdata':
-            if (self.otherdb.has_key(repo)):
-              return
-            self.added[repo] = ['otherdata']
             self.otherdb[repo] = dataobj
         else:
             # We can not handle this yet...
             raise "Sorry sqlite does not support %s" % (datatype)
     
+        self.added[repo].append(datatype)
+
     # Get all files for a certain pkgId from the filelists.xml metadata
     # Search packages that either provide something containing name
     # or provide a file containing name