From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 20 Jun 2020 11:37:35 +0000 (+0100)
Subject: oot: provide `disable' mode
X-Git-Tag: nailing-cargo/1.0.0~131
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=6229d2bcf53954670c83a85384736038214cb0c8;p=nailing-cargo.git

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 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';
 }