[yum-cvs] yum/yum packages.py,1.50,1.51 rpmsack.py,1.6,1.7

[Seth Vidal]

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

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

make rpmsack the default rpmdb interface
minor cleanups


Index: packages.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/packages.py,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- packages.py	5 Jul 2006 18:58:19 -0000	1.50
+++ packages.py	19 Aug 2006 19:22:37 -0000	1.51
@@ -22,7 +22,7 @@
 import re
 import types
 import fnmatch
-import rpmUtils
+from rpmUtils import RpmUtilsError
 import rpmUtils.arch
 import rpmUtils.miscutils
 import Errors
@@ -618,7 +618,7 @@
         
         try:
             hdr = rpmUtils.miscutils.hdrFromPackage(ts, self.localpath)
-        except rpmUtils.RpmUtilsError, e:
+        except RpmUtilsError, e:
             raise Errors.MiscError, \
                 'Could not open local rpm file: %s' % self.localpath
        

Index: rpmsack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/rpmsack.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- rpmsack.py	17 Aug 2006 05:51:50 -0000	1.6
+++ rpmsack.py	19 Aug 2006 19:22:37 -0000	1.7
@@ -30,7 +30,7 @@
 
 class RPMDBPackageSack:
 
-    def __init__(self, ts):
+    def __init__(self, ts=None):
         self.excludes = {}
         self.ts = ts
         self.pkglist = []
@@ -96,17 +96,31 @@
             if not result.has_key(pkg.pkgid):
                 result[pkg.pkgid] = pkg
 
-        # FIXME
-        # check filelists/dirlists
+        
+        fileresults = self.searchFiles(name)
+        for pkg in fileresults:
+            if not result.has_key(pkg.pkgid):
+                result[pkg.pkgid] = pkg
         
         return result.values()
 
-
+    def searchFiles(self, name):
+        """search the filelists in the rpms for anything matching name"""
+        
+        result = {}
+        
+        mi = self.ts.dbMatch('basenames', name)
+        for hdr in mi:
+            pkg = YumInstalledPackage(hdr)
+            if not result.has_key(pkg.pkgid):
+                result[pkg.pkgid] = pkg
+        
+        return result.values()
+        
     def searchPrco(self, name, prcotype):
         result = {}
         table = self.dep_table[prcotype]
         mi = self.ts.dbMatch(table[0], name)
-        #mi.pattern(table[0], rpm.RPMMIRE_STRCMP, name)
         for hdr in mi:
             po = YumInstalledPackage(hdr)
             prcotup = (name, None, (None, None, None))
@@ -118,9 +132,12 @@
             if prcotype != 'provides' or name[0] != '/':
                 if not result.has_key(po.pkgid):
                     result[po.pkgid] = po
-
-            # FIXME: Search package files
-
+            else:
+                fileresults = self.searchFiles(name)
+                for pkg in fileresults:
+                    if not result.has_key(pkg.pkgid):
+                        result[pkg.pkgid] = pkg
+                
         return result.values()
 
     def searchProvides(self, name):
@@ -140,9 +157,11 @@
     
         
     def returnNewestByNameArch(self, naTup=None):
+
         if not naTup:
             return
-
+        
+        (name, arch) = naTup
         allpkg = []
 
         mi = self.ts.dbMatch(rpm.RPMTAG_NAME, naTup[0])
@@ -175,9 +194,14 @@
 
     def searchNevra(self, name=None, epoch=None, ver=None, rel=None, arch=None):
     
+        
         if name and epoch and ver and rel and arch:
-            indexes = self.header_indexes[(n,a,e,v,r)]
-            return self.indexes2list(indexes)
+            if self.header_indexes.has_key((name,arch,epoch,ver,rel)):
+                indexes = self.header_indexes[(name,arch,epoch,ver,rel)]
+                return self.indexes2list(indexes)
+            else:
+                return []
+
         
         removedict = {}
         indexes = []
@@ -322,7 +346,15 @@
         else:
             return []
 
-    
+    def returnIndexByTuple(self, pkgtuple):
+        #FIXME - emit deprecation notice        
+        """returns a list of header indexes based on the pkgtuple provided"""
+        
+        if self.header_indexes.has_key(pkgtuple):
+            return self.header_indexes[pkgtuple]
+        
+        return []
+        
     def addDB(self, ts):
         self.ts = ts
         self.buildIndexes()
@@ -331,11 +363,11 @@
         """searches the rpmdb for what provides the arguments
            returns a list of pkgtuples of providing packages, possibly empty"""
 
-        # we need to check the name - if it doesn't match:
-        # /etc/* bin/* or /usr/lib/sendmail then we should fetch the 
-        # filelists.xml for all repos to make the searchProvides more complete.
         pkgs = self.searchProvides(name)
         
+        if name[0] =='/':
+            morepkgs = self.searchFiles(name)
+            pkgs.extend(morepkgs)
         
         if flags == 0:
             flags = None