[patch] Patch to make --quiet more sane

equery-1.35.78921.patch (text/plain), 5.42 KB, created by Paul Varner (RETIRED) on 2005-04-02 06:33:23 UTC

--- equery-1.35	2005-03-30 13:47:52.000000000 -0600
+++ equery	2005-04-01 14:53:01.000000000 -0600
@@ -214,7 +214,7 @@
 
         (query, opts) = self.parseArgs(args)
 
-        if not Config["piping"]:
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Searching for packages matching " + pp.pkgquery(query) + "... ]")
             
         pkgs = gentoolkit.find_installed_packages(query, True)
@@ -223,7 +223,8 @@
             if not x.is_installed():
                 continue
         
-            print_info(1, pp.section("* ") + "Contents of " + pp.cpv(x.get_cpv()) + ":")
+            if not Config["piping"] and Config["verbosityLevel"] >= 3:
+                print_info(1, pp.section("* ") + "Contents of " + pp.cpv(x.get_cpv()) + ":")
 
             cnt = self.filterContents(x.get_contents(),opts["filter"])
 
@@ -329,7 +330,7 @@
         if cat != "*":
             filter_fn = lambda x: x.find(cat+"/")==0
 
-        if not Config["piping"]:
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Searching for file(s) " + pp.regexpquery(string.join(query,",")) + " in " + pp.cpv(cat) + "... ]")
         
         matches = portage.db["/"]["vartree"].dbapi.cpv_all()
@@ -425,7 +426,7 @@
 
         (query, opts) = self.parseArgs(args)
 
-        if not Config["piping"]:
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Searching for packages matching " + pp.pkgquery(query) + "... ]")
         
         matches = gentoolkit.find_packages(query, True)
@@ -468,7 +469,7 @@
         except IOError:
                 print_warn(5, "Could not load USE flag descriptions from " + path(gentoolkit.settings["PORTDIR"] + "/profiles/use.desc"))
 
-        if not Config["piping"]: 
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Colour Code : " + pp.useflagon("set") + " " + pp.useflagoff("unset") + " ]")
             print_info(3, "[ Legend    : Left column  (U) - USE flags from make.conf              ]")
             print_info(3, "[           : Right column (I) - USE flags packages was installed with ]")
@@ -520,7 +521,7 @@
 
             # pretty print
             if output:
-                if not Config["piping"]:
+                if not Config["piping"] and Config["verbosityLevel"] >= 3:
                     print_info(0, "[ Found these USE variables for " + pp.cpv(bestver) + " ]")
                     print_info(3, pp.emph(" U I"))
                 maxflag_len = 0
@@ -612,7 +613,7 @@
     def perform(self, args):
         (query, opts) = self.parseArgs(args)
 
-        if not Config["piping"]:
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Searching for packages matching " + pp.pkgquery(query) + "... ]")
 
         matches = gentoolkit.find_packages(query, True)
@@ -620,14 +621,15 @@
         for pkg in matches:
             if not pkg.is_installed():
                 continue
-            if Config["piping"]:
-                print_info(0, pkg.get_cpv() + ":")
-            else:
+            if not Config["piping"] and Config["verbosityLevel"] >= 3:
                 print_info(3, pp.section("* ") + "dependency graph for " + pp.cpv(pkg.get_cpv()))
+            else:
+                print_info(0, pkg.get_cpv() + ":")
 
             stats = { "maxdepth": 0, "packages": 0 }
             self._graph(pkg, opts, stats)
-            print_info(0, "[ " + pp.cpv(pkg.get_cpv()) + " stats: packages (" + pp.number(str(stats["packages"])) + \
+            if not Config["piping"] and Config["verbosityLevel"] >= 3:
+                print_info(0, "[ " + pp.cpv(pkg.get_cpv()) + " stats: packages (" + pp.number(str(stats["packages"])) + \
                 "), max depth (" + pp.number(str(stats["maxdepth"])) + ") ]")
         
     def _graph(self, pkg, opts, stats, level=0, pkgtbl=[], suffix=""):
@@ -709,7 +711,7 @@
     def perform(self, args):
         (query, opts) = self.parseArgs(args)
 
-        if not Config["piping"]:
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Searching for packages matching " + pp.pkgquery(query) + "... ]")
 
         matches = gentoolkit.find_packages(query, True)
@@ -803,10 +805,10 @@
         for pkg in matches:
             if not pkg.is_installed():
                 continue
-            if Config["piping"]:
-                print_info(0, pkg.get_cpv() + ":")
-            else:
+            if not Config["piping"] and Config["verbosityLevel"] >= 3:
                 print_info(1, "[ Checking " + pp.cpv(pkg.get_cpv()) + " ]")
+            else:
+                print_info(0, pkg.get_cpv() + ":")
                 
             files = pkg.get_contents()
             checked_files = 0
@@ -987,7 +989,7 @@
   
         (query, opts) = self.parseArgs(args)
 
-        if not Config["piping"]:
+        if not Config["piping"] and Config["verbosityLevel"] >= 3:
             print_info(3, "[ Searching for packages depending on " + pp.pkgquery(query) + "... ]")
 
         isdepend = gentoolkit.split_package_name(query)
@@ -1170,7 +1172,7 @@
             sname = "package '" + name + "'"
             if name == ".*":
                 sname = "all packages"
-            if not Config["piping"]:
+            if not Config["piping"] and Config["verbosityLevel"] >= 3:
                 print_info(1, "[ Searching for " + pp.cpv(sname) + " in " + pp.cpv(scat) + " among: ]")