CLI: remove the '-r' shortcut for --dir-cap, to make it available for cp -r

diff --git a/src/allmydata/scripts/cli.py b/src/allmydata/scripts/cli.py
index de25abd4ba6d526ef716220c0e67958d1674cb75..03014fc3416e8217f8584634689b959a1bb55046 100644 (file)
--- 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 7365f8c5e9edbf57566bcd9182d5793dae8bf9c3..deb07c82babe872faa8f217a63d365631e918c3b 100644 (file)
--- 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")