From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Jun 2020 18:42:54 +0000 (+0100)
Subject: Allow --cargo-lock-update in in-tree builds
X-Git-Tag: nailing-cargo/1.0.0~103
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=54e1fc9eda26d8da580efc082b1a0c4fbba767e3;p=nailing-cargo.git

Allow --cargo-lock-update in in-tree builds

We pass --locked otherwise!

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

diff --git a/README.md b/README.md
index 43bc400..610ed52 100644
--- a/README.md
+++ b/README.md
@@ -283,8 +283,6 @@ Options
     enough to fool cargo.  After cargo has run, the resulting
     `Cargo.lock` is copied back to the source tree.
 
-    This makes no sense with in-tree builds.
-
     Default is no update unless the cargo subcommand will want it.
 
   * `-c` | `-C`
diff --git a/nailing-cargo b/nailing-cargo
index d142422..9b7be11 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -278,9 +278,6 @@ sub consider_oot () {
   my $use = cfgs qw(oot use);
   unless (defined($oot_dir) || defined($use) ||
 	  defined(cfg_uc qw(oot user))) {
-    die "$self: specified --cargo-lock-update but not out-of-tree build!\n"
-      if $cargo_lock_update;
-    $cargo_lock_update=0;
     return;
   }
   if (($use//'') eq 'disable') {