From 1e788daee4ce0c56f71e6f9fa267a1d19eb16c5c Mon Sep 17 00:00:00 2001 From: Daira Hopwood Date: Tue, 21 Oct 2014 18:35:32 +0100 Subject: [PATCH] Improve messages from tahoe start/run. Signed-off-by: Daira Hopwood --- src/allmydata/scripts/startstop_node.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/allmydata/scripts/startstop_node.py b/src/allmydata/scripts/startstop_node.py index de72cc35..e1b5f641 100644 --- a/src/allmydata/scripts/startstop_node.py +++ b/src/allmydata/scripts/startstop_node.py @@ -121,8 +121,7 @@ def start(config, out=sys.stdout, err=sys.stderr): except usage.error, ue: # these arguments were unsuitable for 'twistd' print >>err, config - print >>err, format_twisted_options(twistd_config) - print >>err, "tahoe %s: %s\n" % (config.subcommand_name, ue) + print >>err, "tahoe %s: usage error from twistd: %s\n" % (config.subcommand_name, ue) return 1 twistd_config.loadedPlugins = {"StartTahoeNode": StartTahoeNodePlugin(nodetype, basedir)} @@ -146,7 +145,7 @@ def start(config, out=sys.stdout, err=sys.stderr): # For Tahoe, we don't need to do anything with the child, so we can just # let it exit. - if "--nodaemon" in twistd_args: + if "--nodaemon" in twistd_args or sys.platform == "win32": verb = "running" else: verb = "starting" -- 2.45.2