[yum-cvs] yum-utils repoquery.py,1.24,1.25

[Panu Matilainen]

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

Modified Files:
	repoquery.py 
Log Message:
- fix http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=517
- fix http://devel.linux.duke.edu/bugzilla/show_bug.cgi?id=523 (patch from
  Ville Skyttä)


Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoquery.py,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- repoquery.py	12 Nov 2005 20:09:22 -0000	1.24
+++ repoquery.py	25 Nov 2005 17:33:27 -0000	1.25
@@ -185,8 +185,9 @@
 
     def fmt_list(self, **kw):
         fdict = {}
-        for file in self.pkg.returnFileEntries():
-            fdict[file] = None
+        for ftype in self.pkg.returnFileTypes():
+            for file in self.pkg.returnFileEntries(ftype):
+                fdict[file] = None
         files = fdict.keys()
         files.sort()
         return "\n".join(files)
@@ -432,7 +433,10 @@
                 provs.extend(pkg.prco("provides"))
 
         for prov in provs:
-            for pkg in self.pkgSack.searchRequires(prov):
+            # Only look at the providing name, not the whole version. This 
+            # might occasionally give some false positives but that's 
+            # better than missing ones which it had previously
+            for pkg in self.pkgSack.searchRequires(prov.split()[0]):
                 pkgs[pkg.pkgtup] = pkg
         return self.queryPkgFactory(pkgs.values())