[yum-cvs] yum/yum sqlitesack.py,1.62,1.63

[Seth Vidal]

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

Modified Files:
	sqlitesack.py 
Log Message:

make install/remove/update globs work again :)



Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- sqlitesack.py	23 Feb 2007 16:10:41 -0000	1.62
+++ sqlitesack.py	24 Feb 2007 08:05:46 -0000	1.63
@@ -338,6 +338,8 @@
         if prcotype != "provides" or name[0] != '/':
             return results
 
+
+        # FIXME - combine these two lookups
         # If it is a filename, search the primary.xml file info
         for (rep,cache) in self.primarydb.items():
             cur = cache.cursor()
@@ -363,6 +365,7 @@
         if matched: # if its in the primary.xml files then skip the other check
             return results
         
+        #FIXME - sort this all out.
         # If it is a filename, search the files.xml file info
         for (rep,cache) in self.filelistsdb.items():
             cur = cache.cursor()
@@ -513,7 +516,7 @@
         unmatched = list(pkgspecs)
 
         for p in pkgspecs:
-            if re.match('[\*\?\[\]]', p):
+            if re.match('.*[\*\?\[\]].*', p):
                 query = PARSE_QUERY % ({ "op": "glob", "q": p })
                 matchres = matched
             else: