From a460d261c34c989e5d7baacacac48ef4042e83fe Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Mon, 14 Sep 2020 00:20:07 +0100 Subject: [PATCH] Rename --no-concurrency-lock The old name --no-lock is confusing. Signed-off-by: Ian Jackson --- README.md | 11 ++++++----- nailing-cargo | 4 ++-- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 46086ed..b57d2a7 100644 --- 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 5d92b03..cd9160c 100755 --- 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 Treat command as `cargo ` --subcommand-props=,... 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; -- 2.30.2