[yum-cvs] yum/yum sqlitesack.py,1.57,1.58

Jeremy Katz katzj at linux.duke.edu
Mon Feb 19 22:36:40 UTC 2007


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

Modified Files:
	sqlitesack.py 
Log Message:
* now that we have provides as a property, they get filled in when
  requested and we don't have to prefill with the prco we searched for.
  filling it in means that we don't get it from the sqlitedb for full results

* the LIKE sqlite query seems to not work, disable it for now


Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- sqlitesack.py	3 Feb 2007 21:23:26 -0000	1.57
+++ sqlitesack.py	19 Feb 2007 22:36:38 -0000	1.58
@@ -312,19 +312,6 @@
                     pkg = self.db2class(x)
                     if (self.excludes[rep].has_key(pkg.pkgId)):
                         continue
-                                            
-                    # Add this provides to prco otherwise yum doesn't understand
-                    # that it matches
-                    pkg.prco = {prcotype: 
-                      [
-                      { 'name': res['name'],
-                        'flags': res['flags'],
-                        'rel': res['release'],
-                        'ver': res['version'],
-                        'epoch': res['epoch']
-                      }
-                      ]
-                    }
                     results.append(self.pc(rep,pkg))
 
 
@@ -361,7 +348,8 @@
         for (rep,cache) in self.filelistsdb.items():
             cur = cache.cursor()
             (dirname,filename) = os.path.split(name)
-            if name.find('%') == -1: # no %'s in the thing safe to LIKE
+            # FIXME: why doesn't this work???
+            if 0: # name.find('%') == -1: # no %'s in the thing safe to LIKE
                 executeSQL(cur, "select packages.pkgId as pkgId,\
                     filelist.dirname as dirname,\
                     filelist.filetypes as filetypes,\




More information about the Yum-cvs-commits mailing list