[yum-cvs] yum/yum misc.py, 1.24, 1.25 repoMDObject.py, 1.4, 1.5 yumRepo.py, 1.31, 1.32

[Seth Vidal]

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

Modified Files:
	misc.py repoMDObject.py yumRepo.py 
Log Message:

clean up the silliness to make the db on repos work


Index: misc.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/misc.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- misc.py	3 Feb 2007 21:47:17 -0000	1.24
+++ misc.py	3 Feb 2007 22:04:11 -0000	1.25
@@ -339,7 +339,7 @@
     
 def bunzipFile(source,dest):
     s_fn = bz2.BZ2File(source, 'r')
-    destination = (dest, 'w')
+    destination = open(dest, 'w')
 
     while True:
         data = s_fn.read(1024000)

Index: repoMDObject.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/repoMDObject.py,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- repoMDObject.py	5 Dec 2006 20:45:10 -0000	1.4
+++ repoMDObject.py	3 Feb 2007 22:04:11 -0000	1.5
@@ -97,7 +97,7 @@
         if self.repoData.has_key(type):
             return self.repoData[type]
         else:
-            raise RepoMDError, "Error: requested datatype %s not available" % type
+            raise RepoMDError, "requested datatype %s not available" % type
             
     def dump(self):
         """dump fun output"""

Index: yumRepo.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/yumRepo.py,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- yumRepo.py	3 Feb 2007 21:48:04 -0000	1.31
+++ yumRepo.py	3 Feb 2007 22:04:11 -0000	1.32
@@ -102,10 +102,15 @@
             if self.added.has_key(repo):
                 if item in self.added[repo]:
                     continue
-
+            
+            db_fn = None
             if item == 'metadata':
                 # retrieve _db first, if it exists, and bunzip2 it
-                db_fn = repo.retrieveMD('primary_db')
+                try:
+                    db_fn = repo.retrieveMD('primary_db')
+                except Errors.RepoMDError, e:
+                    pass
+                    
                 if db_fn:
                     db_un_fn = db_fn.replace('.bz2', '')
                     misc.bunzipFile(db_fn, db_un_fn)
@@ -122,7 +127,11 @@
                 del dobj
 
             elif item == 'filelists':
-                db_fn = repo.retrieveMD('filelists_db')
+                try:
+                    db_fn = repo.retrieveMD('filelists_db')
+                except Errors.RepoMDError, e:
+                    pass
+                
                 if db_fn:
                     db_un_fn = db_fn.replace('.bz2', '')
                     misc.bunzipFile(db_fn, db_un_fn)
@@ -140,7 +149,11 @@
 
 
             elif item == 'otherdata':
-                db_fn = repo.retrieveMD('other_db')
+                try:
+                    db_fn = repo.retrieveMD('other_db')
+                except Errors.RepoMDError, e:
+                    pass
+                
                 if db_fn:
                     db_un_fn = db_fn.replace('.bz2', '')
                     misc.bunzipFile(db_fn, db_un_fn)