[yum-cvs] yum-utils repoquery.py,1.10,1.11

[Panu Matilainen]

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

Modified Files:
	repoquery.py 
Log Message:
Repoquery:
- don't treat --qf as a separate operation, it's just formatting of how packages
represent themselves.
- handle --qf with --whatrequires 


Index: repoquery.py
===================================================================
RCS file: /home/groups/yum/cvs/yum-utils/repoquery.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- repoquery.py	9 Jun 2005 18:14:06 -0000	1.10
+++ repoquery.py	9 Jun 2005 20:04:50 -0000	1.11
@@ -297,7 +297,7 @@
         for prov in provs:
             for pkg in self.pkgSack.searchRequires(prov):
                 pkgs[pkg.pkgtup] = pkg
-        return pkgs.values()
+        return self.queryPkgFactory(pkgs.values())
 
     def requires(self, name, **kw):
         pkgs = {}
@@ -394,8 +394,6 @@
     pkgops = []
     sackops = []
     archlist = None
-    if opts.queryformat:
-        pkgops.append("queryformat")
     if opts.requires:
         if opts.resolve:
             sackops.append("requires")
@@ -435,7 +433,7 @@
         needgroup = 1
 
     if opts.nevra or (len(pkgops) == 0 and len(sackops) == 0):
-        pkgops.append("nevra")
+        pkgops.append("queryformat")
 
     repoq = YumBaseQuery(pkgops, sackops, opts)
     repoq.doConfigSetup()