From 5c3e153d0e6db6372ada04f0141f30b417b499b7 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Tue, 18 Nov 2008 18:36:08 -0700 Subject: [PATCH] cli: tahoe stats/manifest: change --verbose to --raw, since I want -v for --verify for check/deep-check/repair --- src/allmydata/scripts/cli.py | 2 +- src/allmydata/scripts/tahoe_manifest.py | 2 +- src/allmydata/test/test_system.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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) -- 2.45.2