[yum-cvs] yum/yum __init__.py,1.143,1.144 depsolve.py,1.69,1.70

[Seth Vidal]

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

Modified Files:
	__init__.py depsolve.py 
Log Message:

fix for rh bugzilla 172510


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -r1.143 -r1.144
--- __init__.py	28 Oct 2005 05:47:16 -0000	1.143
+++ __init__.py	7 Nov 2005 05:10:32 -0000	1.144
@@ -276,6 +276,10 @@
         self.log(3, 'Building updates object')
         #FIXME - add checks for the other pkglists to see if we should
         # raise an error
+        if not hasattr(self, 'pkgSack'):
+            self.doRepoSetup()
+            self.doSackSetup()
+        
         self.up = rpmUtils.updates.Updates(self.rpmdb.getPkgList(),
                                            self.pkgSack.simplePkgList())
         if self.conf.debuglevel >= 6:

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- depsolve.py	4 Oct 2005 18:43:44 -0000	1.69
+++ depsolve.py	7 Nov 2005 05:10:32 -0000	1.70
@@ -249,6 +249,7 @@
                     # if our packageSacks aren't here, then set them up
                     if not hasattr(self, 'pkgSack'):
                         self.doRepoSetup()
+                        self.doSackSetup()
                     (checkdep, missing, conflict, errormsgs) = self._processReq(dep)
                     
                 elif sense == rpm.RPMDEP_SENSE_CONFLICTS: # conflicts - this is gonna be short :)