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 3D5A313827E for ; Sat, 14 Dec 2013 05:14:27 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D5E78E0B65; Sat, 14 Dec 2013 05:14:25 +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 4024FE0B65 for ; Sat, 14 Dec 2013 05:14:25 +0000 (UTC) Received: from mail-qa0-f44.google.com (mail-qa0-f44.google.com [209.85.216.44]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) (Authenticated sender: mattst88) by smtp.gentoo.org (Postfix) with ESMTPSA id 4546733F219 for ; Sat, 14 Dec 2013 05:14:24 +0000 (UTC) Received: by mail-qa0-f44.google.com with SMTP id i13so122080qae.17 for ; Fri, 13 Dec 2013 21:14:22 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type; bh=nUN05wFypx/29TiF1ITUApRej3994l6MfHzEntrPeMA=; b=BZ0NxVsrQuwAis0tssot0lF/1pi9ixEt4R6IBXZALBCj5U8aAL9O5wkVhgX+vUDATB u7LHHNw2YR4GDXJvDpBYTE+yLkb4m52/DvPtQYIB33IYF0Gx5/L9oaXjw3QlYdkyjafw qzx5la1EWw5ufvXTxe77aPLnYaQFTTQZy7qpC3GCSwN1gkgQgyuMqBu4sin1uBEO7DSF ZO6S4sk9fBehME+GK16WWh0oPx4Ziv+h5IHsDOSTE/YpA+HcAGZoeDYuaN7rWQohh0XL ZytKeE5GSuPYHxGXNUyI/yGXOta7Boi9smtVOoArDtDA9eltaDPeqz/AKwPmc3RRC0XJ +ncw== X-Received: by 10.49.17.232 with SMTP id r8mr11267315qed.74.1386998062712; Fri, 13 Dec 2013 21:14:22 -0800 (PST) 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 Received: by 10.229.178.129 with HTTP; Fri, 13 Dec 2013 21:14:02 -0800 (PST) In-Reply-To: <1386990436-9198-5-git-send-email-dolsen@gentoo.org> References: <1386990436-9198-1-git-send-email-dolsen@gentoo.org> <1386990436-9198-5-git-send-email-dolsen@gentoo.org> From: Matt Turner Date: Fri, 13 Dec 2013 21:14:02 -0800 Message-ID: Subject: Re: [gentoo-catalyst] [PATCH 4/4] cleanup long lines, improve usage() output formatting slightly To: gentoo-catalyst@lists.gentoo.org Cc: Brian Dolbec Content-Type: text/plain; charset=ISO-8859-1 X-Archives-Salt: f831a4f1-1eb2-4ed0-bb28-a0181e16263b X-Archives-Hash: d49e3c8aebc0a4057f29ad6963dce47c On Fri, Dec 13, 2013 at 7:07 PM, Brian Dolbec wrote: > --- > catalyst | 83 +++++++++++++++++++++++++++++++++++++--------------------------- > 1 file changed, 48 insertions(+), 35 deletions(-) > > diff --git a/catalyst b/catalyst > index 60cea3e..a68a2ba 100755 > --- a/catalyst > +++ b/catalyst > @@ -24,31 +24,33 @@ __version__="2.0.15" > 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__ > @@ -77,7 +79,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, "+\ No need to add \ (same comment applies elsewhere)