Rename --no-concurrency-lock

The old name --no-lock is confusing.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README.md b/README.md
index 46086ed53d3860d8892d56d1d19ebaec218d1814..b57d2a7035adfc5372b08393a7af97e1d4e368b3 100644 (file)
--- a/README.md
+++ b/README.md
@@ -391,12 +391,13 @@ Options
     rename it from an alternative lockfile name, and put it back.
     Overrides `-u` etc.
 
-  * `--no-lock` | `--lock` (default): Whether to take the
-    nailing-cargo lock.  Some kind of protection against concurrent
-    operation is necessary to prevent multiple instances of
+  * `--no-concurrency-lock` | `--concurrency-lock` (default): Whether
+    to take the nailing-cargo lock.  Some kind of protection against
+    concurrent operation is necessary to prevent multiple instances of
     nailing-cargo trashing each others' work, and possibly mangling
-    your `Cargo.toml`s, `Cargo.lock`, etc., so `--no-lock` is dangerous
-    unless you take other measures against concurrent execution.
+    your `Cargo.toml`s, `Cargo.lock`, etc., so `--no-lock` is
+    dangerous unless you take other measures against concurrent
+    execution.
 
   * `-h` | `--help`: Print usage summary.
 

diff --git a/nailing-cargo b/nailing-cargo
index 5d92b037117ee430e2c03b23cfda3e2da4010c27..cd9160cc43cea2e3d19b2485c2c40bc371c9b5df 100755 (executable)
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -30,7 +30,7 @@ options:
   --just-linkfarm | --clean-linkfarm | --keep-linkfarm (default)
   --no-nail                       Do not nail, just run the command.
   --no-cargo-lock-manip           Do not manipulate Cargo.lock.
-  --no-lock                       Do not take the concurrency lock.
+  --no-concurrency-lock           Do not take the concurrency lock.
 
   -s<subcommand>                  Treat command as `cargo <subcommand>`
   --subcommand-props=<prop>,...   Override command props (see docs)
@@ -955,7 +955,7 @@ sub parse_args () {
       $do_nail = !$1;
     } elsif (m{^--(no)?-cargo-lock-manip$}) {
       $do_cargo_lock = !$1;
-    } elsif (m{^--(no)?-lock$}) {
+    } elsif (m{^--(no)?-concurrency-lock$}) {
       $do_lock = !$1;
     } elsif (m{^--leave-nailed$}) {
       $leave_nailed = 1;