From: Matt Turner <mattst88@gentoo.org>
To: gentoo-catalyst@lists.gentoo.org
Cc: Brian Dolbec <dolsen@gentoo.org>
Subject: Re: [gentoo-catalyst] [PATCH 4/4] cleanup long lines, improve usage() output formatting slightly
Date: Fri, 13 Dec 2013 21:14:02 -0800 [thread overview]
Message-ID: <CAEdQ38GAiEgzQaT+_L-q53yzC2GOD6eD9MtFsEWqJx4v3FZTbQ@mail.gmail.com> (raw)
In-Reply-To: <1386990436-9198-5-git-send-email-dolsen@gentoo.org>
On Fri, Dec 13, 2013 at 7:07 PM, Brian Dolbec <dolsen@gentoo.org> 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)
next prev parent reply other threads:[~2013-12-14 5:14 UTC|newest]
Thread overview: 79+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-14 3:07 [gentoo-catalyst] rewrite-on-master patches Brian Dolbec
2013-12-14 3:07 ` [gentoo-catalyst] [PATCH 1/4] Add more configured defaults Brian Dolbec
2013-12-14 4:12 ` Rick "Zero_Chaos" Farina
2013-12-14 4:51 ` Matt Turner
2013-12-14 11:54 ` Brian Dolbec
2013-12-14 14:33 ` Dylan Baker
2013-12-14 16:31 ` W. Trevor King
2013-12-15 0:05 ` W. Trevor King
2013-12-14 3:07 ` [gentoo-catalyst] [PATCH 2/4] Remove self.mounts and self.mountmap's use of paths for keys and paths Brian Dolbec
2013-12-14 4:26 ` Rick "Zero_Chaos" Farina
2013-12-14 5:08 ` Matt Turner
2013-12-14 11:15 ` Brian Dolbec
2013-12-14 16:37 ` W. Trevor King
2013-12-14 18:05 ` W. Trevor King
2013-12-14 18:44 ` Matt Turner
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 00/21] rewrite-on-master patches (part 1) W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 01/21] modules/tinderbox_target.py: Use 'portdir' instead of hard-coding '/usr/portage' W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 02/21] modules/generic_stage_target.py: " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 03/21] " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 04/21] modules/generic_stage_target.py: Use 'distdir' instead of hard-coding '${PORTAGE}/distfiles' W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 05/21] modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage' W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 06/21] catalyst: Split confdefaults into line-per-entry W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 07/21] catalyst: Add 'repo_name' default W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 08/21] catalyst: Add 'snapshot_name' default W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 09/21] catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages' W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 10/21] catalyst: Add 'port_tmpdir' default instead of hard-coding '/var/tmp/portage' W. Trevor King
2013-12-15 2:56 ` Brian Dolbec
2013-12-15 3:07 ` W. Trevor King
2013-12-15 3:22 ` W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 00/19] rewrite-on-master patches (part 1) W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 01/19] modules/tinderbox_target.py: Use 'portdir' instead of hard-coding '/usr/portage' W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 02/19] modules/generic_stage_target.py: " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 03/19] " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 04/19] modules/generic_stage_target.py: Use 'distdir' instead of hard-coding '${PORTAGE}/distfiles' W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 05/19] modules/generic_stage_target.py: Use a 'local_overlay' setting instead of hard-coding '/usr/local/portage' W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 06/19] catalyst: Split confdefaults into line-per-entry W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 07/19] catalyst: Add 'repo_name' default W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 08/19] catalyst: Add 'snapshot_name' default W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 09/19] catalyst: Add 'packagedir' default instead of hard-coding '/usr/portage/packages' W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 10/19] modules/generic_stage_target.py: Don't use paths as mountmap keys W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 11/19] modules/generic_stage_target.py: Use 'proc' instead of '/proc' as the mountmap key W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 12/19] modules/generic_stage_target.py: Use 'dev' instead of '/dev' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 13/19] modules/generic_stage_target.py: Use 'distdir' instead of '/usr/portage/distfiles' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 14/19] modules/generic_stage_target.py: Use 'port_tmpdir' instead of '/var/tmp/portage' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 15/19] modules/generic_stage_target.py: Use 'devpts' instead of '/dev/pts' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 16/19] modules/generic_stage_target.py: Use 'packagedir' instead of '/usr/portage/packages' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 17/19] modules/generic_stage_target.py: Use 'kerncache' instead of '/tmp/kerncache' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 18/19] modules/generic_stage_target.py: Use 'ccache' instead of '/var/tmp/ccache' " W. Trevor King
2013-12-15 4:00 ` [gentoo-catalyst] [PATCH v3 19/19] catalst: improve usage() output formatting slightly W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 11/21] modules/generic_stage_target.py: Don't use paths as mountmap keys W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 12/21] modules/generic_stage_target.py: Use 'proc' instead of '/proc' as the mountmap key W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 13/21] modules/generic_stage_target.py: Use 'dev' instead of '/dev' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 14/21] modules/generic_stage_target.py: Use 'distdir' instead of '/usr/portage/distfiles' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 15/21] modules/generic_stage_target.py: Use 'port_tmpdir' instead of '/var/tmp/portage' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 16/21] modules/generic_stage_target.py: Use 'devpts' instead of '/dev/pts' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 17/21] modules/generic_stage_target.py: Use 'packagedir' instead of '/usr/portage/packages' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 18/21] modules/generic_stage_target.py: Use 'kerncache' instead of '/tmp/kerncache' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 19/21] modules/generic_stage_target.py: Use 'ccache' instead of '/var/tmp/ccache' " W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 20/21] catalst: improve usage() output formatting slightly W. Trevor King
2013-12-14 22:24 ` [gentoo-catalyst] [PATCH v2 21/21] catalyst: cleanup long lines W. Trevor King
2013-12-14 22:29 ` [gentoo-catalyst] Re: [PATCH v2 00/21] rewrite-on-master patches (part 1) W. Trevor King
2013-12-14 23:10 ` W. Trevor King
2013-12-15 0:24 ` [gentoo-catalyst] " Matt Turner
2013-12-15 1:40 ` W. Trevor King
2013-12-14 14:51 ` [gentoo-catalyst] [PATCH 2/4] Remove self.mounts and self.mountmap's use of paths for keys and paths Dylan Baker
2013-12-14 16:42 ` W. Trevor King
2013-12-14 21:31 ` Dustin C. Hatch
2013-12-14 3:07 ` [gentoo-catalyst] [PATCH 3/4] Adapt commit c52962b6bd2 to use the new configured settings values Brian Dolbec
2013-12-14 4:59 ` Dustin C. Hatch
2013-12-14 6:12 ` Brian Dolbec
2013-12-14 14:54 ` Dylan Baker
2013-12-14 16:07 ` Dylan Baker
2013-12-14 16:22 ` Brian Dolbec
2013-12-14 3:07 ` [gentoo-catalyst] [PATCH 4/4] cleanup long lines, improve usage() output formatting slightly Brian Dolbec
2013-12-14 5:14 ` Matt Turner [this message]
2013-12-14 5:22 ` W. Trevor King
2013-12-14 6:21 ` Brian Dolbec
2013-12-14 14:56 ` Dylan Baker
2013-12-14 16:02 ` Brian Dolbec
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAEdQ38GAiEgzQaT+_L-q53yzC2GOD6eD9MtFsEWqJx4v3FZTbQ@mail.gmail.com \
--to=mattst88@gentoo.org \
--cc=dolsen@gentoo.org \
--cc=gentoo-catalyst@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox