From 6229d2bcf53954670c83a85384736038214cb0c8 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 20 Jun 2020 12:37:35 +0100 Subject: [PATCH] oot: provide `disable' mode This allows more-locally overriding a more-global oot setting. Signed-off-by: Ian Jackson --- README.md | 2 ++ nailing-cargo | 4 ++++ 2 files changed, 6 insertions(+) diff --git a/README.md b/README.md index e134d38..517dcc9 100644 --- a/README.md +++ b/README.md @@ -426,6 +426,8 @@ To control use of alternative `Cargo.lock` filename, use the section * `really`: Use `really` from `chiark-really.deb`. `user` must be given as well. + * `disable': Disable this feature, even if `dir` is set. + * `command`: The command to run for `command_sh` or `command_args`. * `user`: The local username for `really` and `ssh`, or diff --git a/nailing-cargo b/nailing-cargo index 80260d9..e825936 100755 --- a/nailing-cargo +++ b/nailing-cargo @@ -264,6 +264,10 @@ sub consider_oot () { $cargo_lock_update=0; return; } + if ($use eq 'disable') { + $oot_dir = undef; + return; + } $oot_dir //= 'Build'; } -- 2.30.2