[yum-cvs] repoquery.py

[Panu Matilainen]

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

New commits:
commit e53e3d4da3932ddc1eb4d8c2b696d9fc27c0db90
Author: Panu Matilainen <pmatilai at laiskiainen.org>
Date:   Sat Aug 4 19:53:17 2007 +0300

    Repoquery wants to have quiet output by default, it's mostly used in
    scripts where you don't want any extra junk in the output:
    - add --verbose option, default to quiet
    - honor quiet on initialization to avoid messages from plugins as well

diff --git a/repoquery.py b/repoquery.py
old mode 100644
new mode 100755
index 3da6522..0dfc29c
--- a/repoquery.py
+++ b/repoquery.py
@@ -555,7 +555,9 @@ def main(args):
     parser.add_option("--repoid", action="append",
                       help="specify repoids to query, can be specified multiple times (default is all enabled)")
     parser.add_option("--quiet", action="store_true", 
-                      help="quiet (no output to stderr)")
+                      help="quiet (no output to stderr)", default=True)
+    parser.add_option("--verbose", action="store_false",
+                      help="verbose output", dest="quiet")
     parser.add_option("-C", "--cache", action="store_true",
                       help="run from cache only")
     parser.add_option("--tempcache", action="store_true",
@@ -634,10 +636,13 @@ def main(args):
         pkgops.append("queryformat")
 
     repoq = YumBaseQuery(pkgops, sackops, opts)
+
+    # silence initialisation junk from modules etc unless verbose mode
+    initnoise = (not opts.quiet) * 2
     if opts.conffile:
-        repoq.doConfigSetup(fn=opts.conffile)
+        repoq.doConfigSetup(fn=opts.conffile, debuglevel=initnoise)
     else:
-        repoq.doConfigSetup()
+        repoq.doConfigSetup(debuglevel=initnoise)
         
     # Show what is going on, if --quiet is not set.
     if not opts.quiet: