From: Brian Warner <warner@allmydata.com>
Date: Wed, 19 Nov 2008 01:36:08 +0000 (-0700)
Subject: cli: tahoe stats/manifest: change --verbose to --raw, since I want -v for --verify... 
X-Git-Tag: allmydata-tahoe-1.3.0~407
X-Git-Url: https://git.rkrishnan.org/%5B/(%5B%5E?a=commitdiff_plain;h=5c3e153d0e6db6372ada04f0141f30b417b499b7;p=tahoe-lafs%2Ftahoe-lafs.git

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

diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py
index e9f80771..bd578694 100644
--- 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 ae3a4b2b..7f3696f3 100644
--- 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 2f36a707..be196b16 100644
--- 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)