bin/tahoe: clean up global-vs-subcommand arguments like --node-directory

[tahoe-lafs/tahoe-lafs.git] / src / allmydata / scripts / startstop_node.py

diff --git a/src/allmydata/scripts/startstop_node.py b/src/allmydata/scripts/startstop_node.py
index 5045bd6136d58f698a4b7312436c098ebde58ec2..36138e00995949cb16e091c3f6de9aed6eac577f 100644 (file)
--- a/src/allmydata/scripts/startstop_node.py
+++ b/src/allmydata/scripts/startstop_node.py
@@ -1,12 +1,12 @@
 
 import os, sys, signal, time
-from allmydata.scripts.common import BasedirMixin, BaseOptions
+from allmydata.scripts.common import BasedirOptions
 from allmydata.util import fileutil
 from allmydata.util.assertutil import precondition
 from allmydata.util.encodingutil import listdir_unicode, quote_output
 
 
-class StartOptions(BasedirMixin, BaseOptions):
+class StartOptions(BasedirOptions):
     optFlags = [
         ["profile", "p", "Run under the Python profiler, putting results in 'profiling_results.prof'."],
         ["syslog", None, "Tell the node to log to syslog, not a file."],
@@ -16,12 +16,12 @@ class StartOptions(BasedirMixin, BaseOptions):
         return "Usage:  %s start [options] [NODEDIR]" % (self.command_name,)
 
 
-class StopOptions(BasedirMixin, BaseOptions):
+class StopOptions(BasedirOptions):
     def getSynopsis(self):
         return "Usage:  %s stop [options] [NODEDIR]" % (self.command_name,)
 
 
-class RestartOptions(BasedirMixin, BaseOptions):
+class RestartOptions(BasedirOptions):
     optFlags = [
         ["profile", "p", "Run under the Python profiler, putting results in 'profiling_results.prof'."],
         ["syslog", None, "Tell the node to log to syslog, not a file."],
@@ -31,13 +31,9 @@ class RestartOptions(BasedirMixin, BaseOptions):
         return "Usage:  %s restart [options] [NODEDIR]" % (self.command_name,)
 
 
-class RunOptions(BasedirMixin, BaseOptions):
+class RunOptions(BasedirOptions):
     default_nodedir = u"."
 
-    optParameters = [
-        ["node-directory", "d", None, "Specify the directory of the node to be run. [default, for 'tahoe run' only: current directory]"],
-    ]
-
     def getSynopsis(self):
         return "Usage:  %s run [options] [NODEDIR]" % (self.command_name,)