oot: provide `disable' mode

This allows more-locally overriding a more-global oot setting.

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

diff --git a/README.md b/README.md
index e134d38b248fa30685909afe75f6d1db0581cdf7..517dcc9db3d5813677fc41acd9033388c3aae6d7 100644 (file)
--- 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 80260d92a4946f66289bf67c9e3e854c40c72483..e8259365a7dd208cd10be755fb28ecb16b5a4fe4 100755 (executable)
--- 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';
 }