[yum-cvs] yum/yum __init__.py, 1.135, 1.135.2.1 depsolve.py, 1.67, 1.67.2.1

[Seth Vidal]

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

Modified Files:
      Tag: yum-2_4_X
	__init__.py depsolve.py 
Log Message:

fix for rh bz # 172510, Also a potential problem where, when not using the
YumBaseCli class a doRepoSetup() will not also setup the pkgSack.


Index: __init__.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/__init__.py,v
retrieving revision 1.135
retrieving revision 1.135.2.1
diff -u -r1.135 -r1.135.2.1
--- __init__.py	14 Aug 2005 21:33:20 -0000	1.135
+++ __init__.py	7 Nov 2005 05:07:11 -0000	1.135.2.1
@@ -277,6 +277,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.getConfigOption('debuglevel') >= 6:

Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.67
retrieving revision 1.67.2.1
diff -u -r1.67 -r1.67.2.1
--- depsolve.py	9 Jul 2005 22:57:09 -0000	1.67
+++ depsolve.py	7 Nov 2005 05:07:11 -0000	1.67.2.1
@@ -248,6 +248,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 :)