From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 42A55198005 for ; Wed, 27 Feb 2013 09:17:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2155FE05DD; Wed, 27 Feb 2013 09:17:50 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 80EDDE05DD for ; Wed, 27 Feb 2013 09:17:49 +0000 (UTC) Received: from [192.168.1.210] (unknown [24.86.176.233]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: dolsen) by smtp.gentoo.org (Postfix) with ESMTPSA id 81EFA33DC35 for ; Wed, 27 Feb 2013 09:17:48 +0000 (UTC) Message-ID: <1361956647.20292.6.camel@big_daddy.dol-sen.ca> Subject: [gentoo-catalyst] [patch] cleanup long lines, improve useage() output formatting slightly From: Brian Dolbec To: gentoo-catalyst@lists.gentoo.org Date: Wed, 27 Feb 2013 01:17:27 -0800 Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.6.3 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-Archives-Salt: e1b9a781-49e1-4b30-ad85-594af8662c66 X-Archives-Hash: 044d92d1dffe598802162d7e9f20f86d another commit that will apply cleanly to master. ======================================================= diff --git a/catalyst b/catalyst index 0878ce4..2a9b75c 100755 @@ -24,31 +24,33 @@ __version__="2.0.12.2" conf_values={} def usage(): - print "Usage catalyst [options] [-C variable=value...] [ -s identifier]" - print " -a --clear-autoresume clear autoresume flags" - print " -c --config use specified configuration file" - print " -C --cli catalyst commandline (MUST BE LAST OPTION)" - print " -d --debug enable debugging" - print " -f --file read specfile" - print " -F --fetchonly fetch files only" - print " -h --help print this help message" - print " -p --purge clear tmp dirs,package cache and autoresume flags" - print " -P --purgeonly clear tmp dirs,package cache and autoresume flags and exit" - print " -T --purgetmponly clear tmp dirs and autoresume flags and exit" - print " -s --snapshot generate a release snapshot" - print " -V --version display version information" - print " -v --verbose verbose output" - print - print "Usage examples:" - print - print "Using the commandline option (-C, --cli) to build a Portage snapshot:" - print "catalyst -C target=snapshot version_stamp=my_date" - print - print "Using the snapshot option (-s, --snapshot) to build a release snapshot:" - print "catalyst -s 20071121" - print - print "Using the specfile option (-f, --file) to build a stage target:" - print "catalyst -f stage1-specfile.spec" + print """Usage catalyst [options] [-C variable=value...] [ -s identifier] + -a --clear-autoresume clear autoresume flags + -c --config use specified configuration file + -C --cli catalyst commandline (MUST BE LAST OPTION) + -d --debug enable debugging + -f --file read specfile + -F --fetchonly fetch files only + -h --help print this help message + -p --purge clear tmp dirs,package cache, autoresume flags + -P --purgeonly clear tmp dirs,package cache, autoresume flags and exit + -T --purgetmponly clear tmp dirs and autoresume flags and exit + -s --snapshot generate a release snapshot + -V --version display version information + -v --verbose verbose output + +Usage examples: + +Using the commandline option (-C, --cli) to build a Portage snapshot: +catalyst -C target=snapshot version_stamp=my_date + +Using the snapshot option (-s, --snapshot) to build a release snapshot: +catalyst -s 20071121" + +Using the specfile option (-f, --file) to build a stage target: +catalyst -f stage1-specfile.spec +""" + def version(): print "Catalyst, version "+__version__ @@ -78,7 +80,8 @@ def parse_config(myconfig): # first, try the one passed (presumably from the cmdline) if myconfig: if os.path.exists(myconfig): - print "Using command line specified Catalyst configuration file, "+myconfig + print "Using command line specified Catalyst configuration file, "+\ + myconfig config_file=myconfig else: @@ -88,7 +91,8 @@ def parse_config(myconfig): # next, try the default location elif os.path.exists("/etc/catalyst/catalyst.conf"): - print "Using default Catalyst configuration file, /etc/catalyst/catalyst.conf" + print "Using default Catalyst configuration file," + \ + " /etc/catalyst/catalyst.conf" config_file="/etc/catalyst/catalyst.conf" # can't find a config file (we are screwed), so bail out @@ -188,14 +192,16 @@ def parse_config(myconfig): conf_values["port_logdir"]=myconf["port_logdir"]; def import_modules(): - # import catalyst's own modules (i.e. catalyst_support and the arch modules) + # import catalyst's own modules + # (i.e. catalyst_support and the arch modules) targetmap={} try: for x in required_build_targets: try: fh=open(conf_values["sharedir"]+"/modules/"+x+".py") - module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE)) + module=imp.load_module(x,fh,"modules/"+x+".py", + (".py","r",imp.PY_SOURCE)) fh.close() except IOError: @@ -205,7 +211,8 @@ def import_modules(): for x in valid_build_targets: try: fh=open(conf_values["sharedir"]+"/modules/"+x+".py") - module=imp.load_module(x,fh,"modules/"+x+".py",(".py","r",imp.PY_SOURCE)) + module=imp.load_module(x,fh,"modules/"+x+".py", + (".py","r",imp.PY_SOURCE)) module.register(targetmap) fh.close() @@ -223,7 +230,8 @@ def import_modules(): def build_target(addlargs, targetmap): try: if addlargs["target"] not in targetmap: - raise CatalystError,"Target \""+addlargs["target"]+"\" not available." + raise CatalystError, \ + "Target \"%s\" not available." % addlargs["target"] mytarget=targetmap[addlargs["target"]](conf_values, addlargs) @@ -231,7 +239,8 @@ def build_target(addlargs, targetmap): except: catalyst.util.print_traceback() - print "!!! catalyst: Error encountered during run of target " + addlargs["target"] + print "!!! catalyst: Error encountered during run of target " + \ + addlargs["target"] sys.exit(1) if __name__ == "__main__": @@ -250,8 +259,12 @@ if __name__ == "__main__": # parse out the command line arguments try: - opts,args = getopt.getopt(sys.argv[1:], "apPThvdc:C:f:FVs:", ["purge", "purgeonly", "purgetmponly", "help", "version", "debug",\ - "clear-autoresume", "config=", "cli=", "file=", "fetch", "verbose","snapshot="]) + opts,args = getopt.getopt(sys.argv[1:], "apPThvdc:C:f:FVs:", + ["purge", "purgeonly", "purgetmponly", "help", "version", "debug", + "clear-autoresume", "config=", "cli=", "file=", "fetch", + "verbose","snapshot=" + ] + ) except getopt.GetoptError: usage() -- Brian Dolbec