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

[Jeremy Katz]

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

Modified Files:
	sqlitesack.py 
Log Message:
we need to take excludes into account with matchPackageNames()


Index: sqlitesack.py
===================================================================
RCS file: /home/groups/yum/cvs/yum/yum/sqlitesack.py,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -r1.58 -r1.59
--- sqlitesack.py	19 Feb 2007 22:36:38 -0000	1.58
+++ sqlitesack.py	21 Feb 2007 16:36:53 -0000	1.59
@@ -503,11 +503,11 @@
             for (rep, db) in self.primarydb.items():
                 cur = db.cursor()
                 executeSQL(cur, query)
-                res = cur.fetchall()
-                if len(res) > 0:
+                for pkg in cur.fetchall():
+                    if self.excludes[rep].has_key(pkg['pkgId']):
+                        continue
                     unmatched.remove(p)
-                    pos = map(lambda x: self.pc(rep,self.db2class(x,True)), res)
-                    matchres.extend(pos)
+                    matchres.append(self.pc(rep,self.db2class(pkg,True)))
 
         exactmatch = misc.unique(exactmatch)
         matched = misc.unique(matched)