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 43bc40036d4c16277ade8d81ee7d9c20e580211f..610ed524f436ee0aca0cde507fb1ff2ddd741809 100644 (file)
--- 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 d142422c86f6f0b80b2e08243c8bea0f478996ca..9b7be113d20b482d24a2823d42b53723f19617ea 100755 (executable)
--- 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') {