From 0f8f213baffceb9770ba1dc64a2d80f1a12e6e17 Mon Sep 17 00:00:00 2001 From: Brian Warner Date: Wed, 21 May 2008 17:55:32 -0700 Subject: [PATCH] CLI: remove the '-r' shortcut for --dir-cap, to make it available for cp -r --- src/allmydata/scripts/cli.py | 2 +- src/allmydata/test/test_system.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py index de25abd4..03014fc3 100644 --- a/src/allmydata/scripts/cli.py +++ b/src/allmydata/scripts/cli.py @@ -17,7 +17,7 @@ class VDriveOptions(BaseOptions, usage.Options): ["node-url", "u", None, "URL of the tahoe node to use, a URL like \"http://127.0.0.1:8123\". " "This overrides the URL found in the --node-directory ."], - ["dir-cap", "r", None, + ["dir-cap", None, None, "Which dirnode URI should be used as the 'tahoe' alias."] ] diff --git a/src/allmydata/test/test_system.py b/src/allmydata/test/test_system.py index 7365f8c5..deb07c82 100644 --- a/src/allmydata/test/test_system.py +++ b/src/allmydata/test/test_system.py @@ -1800,7 +1800,7 @@ class SystemTest(testutil.SignalMixin, testutil.PollMixin, testutil.StallMixin, open(os.path.join(sdn2, "rfile5"), "wb").write("rfile5") # from disk into tahoe - d.addCallback(run, "cp", "--recursive", dn, "tahoe:dir1") + d.addCallback(run, "cp", "-r", dn, "tahoe:dir1") d.addCallback(run, "ls") d.addCallback(_check_ls, ["dir1"]) d.addCallback(run, "ls", "dir1") -- 2.45.2