From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sat, 10 Oct 2020 01:19:00 +0000 (+0100)
Subject: fix oot Cargo.lock
X-Git-Tag: nailing-cargo/1.0.0~51
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e859006aea057da0d33e48da659638dbb68c65b9;p=nailing-cargo.git

fix oot Cargo.lock

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

diff --git a/nailing-cargo b/nailing-cargo
index 35feceb..c1b21ec 100755
--- a/nailing-cargo
+++ b/nailing-cargo
@@ -654,9 +654,11 @@ END_FILES_FULL
 	done' x "$src";
 END_DEEP
     }
-    $pre .= <<'ENDLK' if $do_cargo_lock && stat_exists 'Cargo.lock', 'working cargo lockfile';
-	rm -f Cargo.lock;
-        cp -- "$src"/Cargo.lock .;
+    $pre .= <<'ENDLK' if $do_cargo_lock;
+	if test -e Cargo.lock; then
+	  rm -f Cargo.lock;
+          cp -- "$src"/Cargo.lock .;
+        fi;
 ENDLK
     $post = <<'ENDCLEAN' if $oot_clean && !$just_linkfarm;
         clean;