[yum-commits] repoquery.py

[skvidal at osuosl.org]

 repoquery.py |   19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

New commits:
commit 493450d26d04e3f61470e21f7db717e7d98e3d57
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Thu Feb 25 12:58:35 2010 -0500

    move around where we query for pkgs from sackops/prcos and what happens if no special output format
    is specified in repoquery.
    
    makes:
    repoquery -qfi /bin/bash output -qi output rather than -q output.

diff --git a/repoquery.py b/repoquery.py
index 0a56430..225a4cb 100755
--- a/repoquery.py
+++ b/repoquery.py
@@ -504,10 +504,21 @@ class YumBaseQuery(yum.YumBase):
         else:
             if self.options.srpm:
                 pkgs = self.matchSrcPkgs(items)
+
             else:
                 pkgs = self.matchPkgs(items)
+                for prco in items:
+                    for oper in self.sackops:
+                        try:
+                            for p in self.doQuery(oper, prco): 
+                                if p:
+                                    pkgs.append(p)
+                        except queryError, e:
+                            self.logger.error( e.msg)
 
         for pkg in pkgs:
+            if not self.pkgops:
+                print to_unicode(pkg)
             for oper in self.pkgops:
                 try:
                     out = pkg.doQuery(oper)
@@ -515,14 +526,6 @@ class YumBaseQuery(yum.YumBase):
                         print to_unicode(out)
                 except queryError, e:
                     self.logger.error( e.msg)
-        for prco in items:
-            for oper in self.sackops:
-                try:
-                    for p in self.doQuery(oper, prco): 
-                        if p:
-                            print p
-                except queryError, e:
-                    self.logger.error( e.msg)
 
     def doQuery(self, method, *args, **kw):
         return getattr(self, "fmt_%s" % method)(*args, **kw)