[yum-cvs] yum/yum depsolve.py,1.95,1.96 rpmsack.py,1.21,1.22

[Seth Vidal]

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

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

added our rpmdb index into package objects from the rpmdb.

po.idx

gets rid of last returnIndexesByTuple()



Index: depsolve.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/depsolve.py,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- depsolve.py	30 Aug 2006 16:49:18 -0000	1.95
+++ depsolve.py	1 Sep 2006 19:00:07 -0000	1.96
@@ -160,12 +160,10 @@
             elif txmbr.ts_state in ['e']:
                 if ts_elem.has_key((txmbr.pkgtup, txmbr.ts_state)):
                     continue
-                indexes = self.rpmdb.returnIndexByTuple(txmbr.pkgtup)
-                for idx in indexes:
-                    self.ts.addErase(idx)
-                    if self.dsCallback: self.dsCallback.pkgAdded(txmbr.pkgtup, 'e')
-                    self.verbose_logger.log(logginglevels.DEBUG_1,
-                        'Removing Package %s', txmbr.po)
+                self.ts.addErase(txmbr.po.idx)
+                if self.dsCallback: self.dsCallback.pkgAdded(txmbr.pkgtup, 'e')
+                self.verbose_logger.log(logginglevels.DEBUG_1,
+                    'Removing Package %s', txmbr.po)
         
 
     def resolveDeps(self):
@@ -571,7 +569,7 @@
                 # from ts
                 tspkgs = self.tsInfo.matchNaevr(name=pkg.name, arch=pkg.arch)
                 for tspkg in tspkgs:
-                    if tspkg > pkg:
+                    if tspkg.po > pkg:
                         msg = 'Potential resolving package %s has newer instance in ts.' % pkg
                         self.verbose_logger.log(logginglevels.DEBUG_2, msg)
                         provSack.delPackage(pkg)

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- rpmsack.py	27 Aug 2006 20:07:25 -0000	1.21
+++ rpmsack.py	1 Sep 2006 19:00:07 -0000	1.22
@@ -269,7 +269,10 @@
         all = []
         for idx in indexlist:
             hdr  = self.hdrByindex(idx)
-            all.append(YumInstalledPackage(hdr))
+            po = YumInstalledPackage(hdr)
+            # store our index in the po
+            po.idx = idx
+            all.append(po)
         
         return all