chiark / gitweb /
fix oot Cargo.lock
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Oct 2020 01:19:00 +0000 (02:19 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 10 Oct 2020 01:19:00 +0000 (02:19 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
nailing-cargo

index 35feceb4e9de02542e9cc5c7256ee34d4c4f0568..c1b21ec0d14082b7280ef7d111128ba8a819beb1 100755 (executable)
@@ -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;