From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from lists.gentoo.org ([140.105.134.102] helo=robin.gentoo.org) by nuthatch.gentoo.org with esmtp (Exim 4.62) (envelope-from ) id 1GyRPZ-0005PE-3s for garchives@archives.gentoo.org; Sun, 24 Dec 2006 11:21:01 +0000 Received: from robin.gentoo.org (localhost [127.0.0.1]) by robin.gentoo.org (8.13.8/8.13.8) with SMTP id kBOBKcn5015359; Sun, 24 Dec 2006 11:20:38 GMT Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by robin.gentoo.org (8.13.8/8.13.8) with ESMTP id kBOBKbC2023654 for ; Sun, 24 Dec 2006 11:20:38 GMT Received: from home.wh0rd.org (pool-141-154-225-206.bos.east.verizon.net [141.154.225.206]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id AA3BD64869 for ; Sun, 24 Dec 2006 11:20:36 +0000 (UTC) Received: (qmail 13708 invoked from network); 24 Dec 2006 06:17:12 -0500 Received: from unknown (HELO vapier) (192.168.0.2) by 192.168.0.1 with SMTP; 24 Dec 2006 06:17:12 -0500 From: Mike Frysinger Organization: wh0rd.org To: gentoo-catalyst@gentoo.org Subject: [gentoo-catalyst] [patch] make catalyst less noisy Date: Sun, 24 Dec 2006 06:21:02 -0500 User-Agent: KMail/1.9.5 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org MIME-Version: 1.0 Content-Type: Multipart/Mixed; boundary="Boundary-00=_fKmjFLYNnOZokPS" Message-Id: <200612240621.03176.vapier@gentoo.org> X-Archives-Salt: 36e7a97a-7888-4bec-ad67-88a3a410b1c1 X-Archives-Hash: 3099a97fbd0f7dff0f3a28a548ec8977 --Boundary-00=_fKmjFLYNnOZokPS Content-Type: multipart/signed; boundary="nextPart1546208.FmmSIhgoYW"; protocol="application/pgp-signature"; micalg=pgp-sha1 Content-Transfer-Encoding: 7bit --nextPart1546208.FmmSIhgoYW Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Content-Disposition: inline i've wrapped a bunch of the output in 'if verbose' to make the default outp= ut=20 a lot less cluttered =2Dmike --nextPart1546208.FmmSIhgoYW Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iQIVAwUARY5inkFjO5/oN/WBAQLnlhAArheT0IW7FURV490YLvvzSm+3nFZzyljS OQeqZGdwsr0LuhgiXQDWxDKSwNljrLhdDC+xd6iKJ0/3AfDbW4rBoFsfuBOuHe1a i8jZP0PiWsbe/gVBersZqqWQdKIxZxlBv/CQnSSwRguyy7w5tUXj052K3EslCXSz n68i2rEjGDQGh7cYXNNzuWNYw8ocFF/kSsdVxOL9YFpw87eLbp2QyLP+XZRJQ9rj qd0UNBVfVpDI648hU9/qx/avHB8f06251SKG9ST6RD1eMh//mpdN+sydTYImeu9z j05uZDvPtuQ5u6DE6r9TEi9lrUuy301J14EiOHahFWLK5+34dmDBYXZ/U3sgD6gc 59kbkZQoUEJZ7vSl9i5dixXY2tX44xIrtGqSYYJn20vx0RACaj99gJFEM2L4su18 +tihT4j5tE5p9lODHq1pt4ROIjnfH5J6j40BNeUyhWMsdG6EV77pkdhqDzD9FBcq HZmLkBbDrSVs3s5RkJI7PxophlgrYb5AuZxbRhoQNU+dpW+2P3wEdvezgO7+1SHU jN95Nei4qc7JBGurOoUPYs+7595kNTb0wefl3igszdPcYGjp0HKgI7vGFWp4xpJd 2mmsy4MvZ3bZc2wCtJcijwoGwOcCFA/iEwMqsi85LiRQVGjOH0s3JNrBnS/M2I9D e4Darl0NIlg= =N7l1 -----END PGP SIGNATURE----- --nextPart1546208.FmmSIhgoYW-- --Boundary-00=_fKmjFLYNnOZokPS Content-Type: text/x-diff; charset="us-ascii"; name="catalyst-verbose.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="catalyst-verbose.patch" Index: catalyst =================================================================== RCS file: /var/cvsroot/gentoo/src/catalyst/catalyst,v retrieving revision 1.162 diff -u -p -r1.162 catalyst --- catalyst 2 Oct 2006 20:41:53 -0000 1.162 +++ catalyst 24 Dec 2006 11:19:10 -0000 @@ -86,51 +86,65 @@ def parse_config(myconfig): # now, load up the values into conf_values so that we can use them for x in confdefaults.keys(): if myconf.has_key(x): - print "Setting",x,"to config file value \""+myconf[x]+"\"" + if verbose: + print "Setting",x,"to config file value \""+myconf[x]+"\"" conf_values[x]=myconf[x] else: - print "Setting",x,"to default value \""+confdefaults[x]+"\"" + if verbose: + print "Setting",x,"to default value \""+confdefaults[x]+"\"" conf_values[x]=confdefaults[x] + conf_values["sharedir"] = "/usr/local/gentoo/src/catalyst" + # parse out the rest of the options from the config file if "ccache" in string.split(conf_values["options"]): - print "Compiler cache support enabled." + if verbose: + print "Compiler cache support enabled." conf_values["CCACHE"]="1" if "pkgcache" in string.split(conf_values["options"]): - print "Package cache support enabled." + if verbose: + print "Package cache support enabled." conf_values["PKGCACHE"]="1" if "snapcache" in string.split(conf_values["options"]): - print "Snapshot cache support enabled." + if verbose: + print "Snapshot cache support enabled." conf_values["SNAPCACHE"]="1" if "seedcache" in string.split(conf_values["options"]): - print "Seed cache support enabled." + if verbose: + print "Seed cache support enabled." conf_values["SEEDCACHE"]="1" if "kerncache" in string.split(conf_values["options"]): - print "Kernel cache support enabled." + if verbose: + print "Kernel cache support enabled." conf_values["KERNCACHE"]="1" if "distcc" in string.split(conf_values["options"]): - print "Distcc support enabled." + if verbose: + print "Distcc support enabled." conf_values["DISTCC"]="1" if "autoresume" in string.split(conf_values["options"]): - print "Autoresuming support enabled." + if verbose: + print "Autoresuming support enabled." conf_values["AUTORESUME"]="1" if "purge" in string.split(conf_values["options"]): - print "Purge support enabled." + if verbose: + print "Purge support enabled." conf_values["PURGE"]="1" if "clear-autoresume" in string.split(conf_values["options"]): - print "Cleaning autoresume flags support enabled." + if verbose: + print "Cleaning autoresume flags support enabled." conf_values["CLEAR_AUTORESUME"]="1" if myconf.has_key("envscript"): - print "Envscript support enabled." + if verbose: + print "Envscript support enabled." conf_values["ENVSCRIPT"]=myconf["envscript"] if myconf.has_key("digests"): @@ -200,7 +214,6 @@ def build_target(addlargs, targetmap): if __name__ == "__main__": targetmap={} - version() if os.getuid() != 0: # catalyst cannot be run as a normal user due to chroots, mounts, etc print "!!! catalyst: This script requires root privileges to operate" @@ -280,6 +293,7 @@ if __name__ == "__main__": conf_values["FETCH"]="1" if o in ("-v", "--verbose"): + verbose = True if len(sys.argv) < 3: print "!!! catalyst: please specify one of either -f or -C\n" usage() @@ -316,6 +330,9 @@ if __name__ == "__main__": usage() sys.exit(2) + if verbose: + version() + # import configuration file and import our main module using those settings parse_config(myconfig) sys.path.append(conf_values["sharedir"]+"/modules") --Boundary-00=_fKmjFLYNnOZokPS-- -- gentoo-catalyst@gentoo.org mailing list