cli: tahoe stats/manifest: change --verbose to --raw, since I want -v for --verify...

diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py
index e9f8077110a1a6cbf5352a18eaff32422e3a2d2e..bd578694463c4ce75b165d6be6ea482747aba9f6 100644 (file)
--- a/src/allmydata/scripts/cli.py
+++ b/src/allmydata/scripts/cli.py
@@ -211,7 +211,7 @@ class ManifestOptions(VDriveOptions):
 
 class StatsOptions(VDriveOptions):
     optFlags = [
-        ("verbose", "v", "Display raw JSON data instead of parsed"),
+        ("raw", "r", "Display raw JSON data instead of parsed"),
         ]
     def parseArgs(self, where=''):
         self.where = where

diff --git a/src/allmydata/scripts/tahoe_manifest.py b/src/allmydata/scripts/tahoe_manifest.py
index ae3a4b2bff97b8b6b6c04735c9679078efd0c312..7f3696f30711364eb86ed971dc7bb543af0bdf7f 100644 (file)
--- a/src/allmydata/scripts/tahoe_manifest.py
+++ b/src/allmydata/scripts/tahoe_manifest.py
@@ -67,7 +67,7 @@ class SlowOperationRunner:
         data = simplejson.loads(jdata)
         if not data["finished"]:
             return False
-        if self.options.get("verbose"):
+        if self.options.get("raw"):
             print >>stdout, jdata
             return True
         self.write_results(data)

diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py
index 2f36a707f94fc57d3dce66436180c688f4e1ecd4..be196b16179834f550cc10eaf1f1be58c836e246 100644 (file)
--- a/src/allmydata/test/test_system.py
+++ b/src/allmydata/test/test_system.py
@@ -2449,7 +2449,7 @@ class DeepCheckWebGood(DeepCheckBase, unittest.TestCase):
         d.addCallback(lambda res:
                       self._run_cli(["stats",
                                      "--node-directory", basedir,
-                                     "--verbose",
+                                     "--raw",
                                      self.root_uri]))
         def _check4((out,err)):
             data = simplejson.loads(out)