From d289dde85f7b23feb852302db215c64e5b166380 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Sat, 10 Oct 2020 13:19:55 +0100 Subject: [PATCH] Revert "For revert: never symlink Cargo.toml" This reverts commit 3786ac21ed0d37906256e26f352871679b1d9bf6. Signed-off-by: Ian Jackson --- nailing-cargo | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/nailing-cargo b/nailing-cargo index e1118fe..1489f7f 100755 --- a/nailing-cargo +++ b/nailing-cargo @@ -624,7 +624,7 @@ END_BOTH if ($linkfarm_depth eq 'shallow') { $pre.= <<'END_SHALLOW'; clean () { find -lname "$src/*" -print0 | xargs -0r rm --; }; clean; - find "$src" -maxdepth 1 \! -name Cargo.lock Cargo.toml -print0 | + find "$src" -maxdepth 1 \! -name Cargo.lock -print0 | xargs -0r sh -ec 'for f in "$@"; do rm -rf "${f##*/}"; ln -sf -- "$f" .; @@ -657,15 +657,11 @@ END_FILES_FULL ' "$src"; END_DEEP } - # If Cargo.toml is a symlink, cargo dereferences it to - # find a wrong CARGO_MANIFEST_DIR. $pre .= <<'ENDLK' if $do_cargo_lock; - for f in Cargo.toml Cargo.lock; do - if test -e $f; then - rm -f $f; - cp -- "$src"/$f .; - fi; - done; + if test -e Cargo.lock; then + rm -f Cargo.lock; + cp -- "$src"/Cargo.lock .; + fi; ENDLK $post = <<'ENDCLEAN' if $oot_clean && !$just_linkfarm; clean; -- 2.30.2