From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 21 Jun 2020 18:29:52 +0000 (+0100)
Subject: nailing-cargo: Fix handling of missing oot.use
X-Git-Tag: nailing-cargo/1.0.0~114
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=782cb41626ff88f697369ea543e697f136d45fe9;p=nailing-cargo.git

nailing-cargo: Fix handling of missing oot.use

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

diff --git a/nailing-cargo b/nailing-cargo
index e737d78..72abb09 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -283,7 +283,7 @@ sub consider_oot () {
     $cargo_lock_update=0;
     return;
   }
-  if ($use eq 'disable') {
+  if (($use//'') eq 'disable') {
     $oot_dir = undef;
     return;
   }
@@ -406,6 +406,7 @@ sub oot_massage_cmdline () {
   return unless defined $oot_dir;
 
   my $use = cfgs qw(oot use);
+  $use // die "$self: out-of-tree build, but \`oot.use' not configured\n";
   $oot_absdir = ($oot_dir !~ m{^/} ? "$worksphere/" : ""). $oot_dir;
   $build_absdir = "$oot_absdir/$subdir";