From a7d70c6a56f11f0acee3ab6ae7dc32923277c540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Sun, 5 Mar 2017 13:19:24 +0100 Subject: [PATCH 1/3] cd: remove weird redundant "default default" help string --- whipper/command/cd.py | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/whipper/command/cd.py b/whipper/command/cd.py index 037d9c6..e7ccfc4 100644 --- a/whipper/command/cd.py +++ b/whipper/command/cd.py @@ -296,13 +296,11 @@ Log files will log the path to tracks relative to this directory. self.parser.add_argument('--track-template', action="store", dest="track_template", default=DEFAULT_TRACK_TEMPLATE, - help="template for track file naming " - "(default default)") + help="template for track file naming") self.parser.add_argument('--disc-template', action="store", dest="disc_template", default=DEFAULT_DISC_TEMPLATE, - help="template for disc file naming " - "(default default)") + help="template for disc file naming") self.parser.add_argument('-U', '--unknown', action="store_true", dest="unknown", help="whether to continue ripping if " From 6938c506bb5cf40829a6048abcdfbf23282f20b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 8 Sep 2017 20:55:55 +0200 Subject: [PATCH 2/3] basecommand: use logger.critical() instead of sys.stderr.write() As a side effect, this fixes the missing trailing line break. --- whipper/command/basecommand.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/whipper/command/basecommand.py b/whipper/command/basecommand.py index e33aa64..379a23b 100644 --- a/whipper/command/basecommand.py +++ b/whipper/command/basecommand.py @@ -93,8 +93,8 @@ class BaseCommand(): self.parser.print_help() sys.exit(0) if not self.options.remainder[0] in self.subcommands: - sys.stderr.write("incorrect subcommand: %s" % - self.options.remainder[0]) + logger.critical("incorrect subcommand: %s", + self.options.remainder[0]) sys.exit(1) self.cmd = self.subcommands[self.options.remainder[0]]( self.options.remainder[1:], From 984dd524ef3006be31508fffe2a81f03a6067cfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cl=C3=A9ment=20B=C5=93sch?= Date: Fri, 8 Sep 2017 21:13:58 +0200 Subject: [PATCH 3/3] README: document developer installation as user If you're looking into running uninstalled, you likely don't want to setup as root. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index abd70c2..27f2fe0 100644 --- a/README.md +++ b/README.md @@ -228,7 +228,7 @@ To make it easier for developers, you can run whipper straight from the source checkout: ```bash -python2 setup.py develop +python2 setup.py develop --user whipper -h ```