[yum-cvs] yum/yum sqlitesack.py,1.8,1.9

[Gijs Hollestelle]

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

Modified Files:
	sqlitesack.py 
Log Message:
Dont list providing packages if they are excluded.



Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sqlitesack.py	2 Mar 2005 16:51:20 -0000	1.8
+++ sqlitesack.py	2 Mar 2005 16:55:21 -0000	1.9
@@ -161,6 +161,8 @@
             cur = cache.cursor()
             cur.execute("select DISTINCT packages.pkgId from provides,packages where provides.name LIKE '%%%s%%' AND provides.pkgKey = packages.pkgKey" % quotename)
             for ob in cur.fetchall():
+                if (self.excludes[rep].has_key(ob['packages.pkgId'])):
+                    continue
                 pkg = self.getPackageDetails(ob['packages.pkgId'])
                 result.append((self.pc(pkg,rep)))
 
@@ -180,6 +182,8 @@
                 # Check if it is an actual match
                 # The query above can give false positives, when
                 # a package provides /foo/aaabar it will also match /foo/bar
+                if (self.excludes[rep].has_key(ob['packages.pkgId'])):
+                    continue
                 real = False
                 for filename in ob['filelist.filenames'].split('/'):
                     if (ob['filelist.dirname']+'/'+filename).find(name) != -1: