Address Kevan's comment in #776 about Options classes missed when adding 'self.comman...

diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py
index 0eeb78d90309686e0ad0c1496ff8f18052523b20..c4b0fcf163929e6878edc685bb4d5dc347d4db28 100644 (file)
--- a/src/allmydata/scripts/cli.py
+++ b/src/allmydata/scripts/cli.py
@@ -220,7 +220,7 @@ class CpOptions(VDriveOptions):
         self.destination = argv_to_unicode(args[-1])
 
     def getSynopsis(self):
-        return "Usage: tahoe cp [options] FROM.. TO"
+        return "Usage: %s cp [options] FROM.. TO" % (self.command_name,)
 
     longdesc = """
     Use 'tahoe cp' to copy files between a local filesystem and a Tahoe grid.

diff --git a/src/allmydata/scripts/keygen.py b/src/allmydata/scripts/keygen.py
index cd8e1ce2298089e016d5d8dc138899ef4a4cdfff..1f5c30f5287d150e60a4850ef83e60bd349ff308 100644 (file)
--- a/src/allmydata/scripts/keygen.py
+++ b/src/allmydata/scripts/keygen.py
@@ -12,7 +12,7 @@ class CreateKeyGeneratorOptions(BasedirMixin, BaseOptions):
     ]
 
     def getSynopsis(self):
-        return "Usage:  %s create-key-generator [options] NODEDIR" % (os.path.basename(sys.argv[0]),)
+        return "Usage:  %s create-key-generator [options] NODEDIR" % (self.command_name,)
 
 
 keygen_tac = """

diff --git a/src/allmydata/scripts/stats_gatherer.py b/src/allmydata/scripts/stats_gatherer.py
index 2a4372c6152b6b51f74697c45e53bd5eac0561b6..230d4a9073fb41d186b07450705ec59021f08b39 100644 (file)
--- a/src/allmydata/scripts/stats_gatherer.py
+++ b/src/allmydata/scripts/stats_gatherer.py
@@ -12,7 +12,7 @@ class CreateStatsGathererOptions(BasedirMixin, BaseOptions):
     ]
 
     def getSynopsis(self):
-        return "Usage:  %s create-stats-gatherer [options] NODEDIR" % (os.path.basename(sys.argv[0]),)
+        return "Usage:  %s create-stats-gatherer [options] NODEDIR" % (self.command_name,)
 
 
 stats_gatherer_tac = """