From a5532a9e009736a05edcbdbbb061ac15d9c4a403 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 6 May 2024 13:00:17 +0200 Subject: [PATCH] d/prune-unused-deps: handle cargo-as-workspace MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit with 1.71.x, src/tools/cargo is a workspace (embedded as a git submodule upstream), and no longer a member of the main workspace. Signed-off-by: Fabian Grünbichler --- debian/prune-unused-deps | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps index 5807b4a4c4..ae733854f6 100755 --- a/debian/prune-unused-deps +++ b/debian/prune-unused-deps @@ -17,6 +17,7 @@ done test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig test -f src/bootstrap/Cargo.lock.orig || cp src/bootstrap/Cargo.lock src/bootstrap/Cargo.lock.orig test -f src/tools/rust-analyzer/Cargo.lock.orig || cp src/tools/rust-analyzer/Cargo.lock src/tools/rust-analyzer/Cargo.lock.orig +test -f src/tools/cargo/Cargo.lock.orig || cp src/tools/cargo/Cargo.lock src/tools/cargo/Cargo.lock.orig rm -f Cargo.lock src/bootstrap/Cargo.lock src/tools/rust-analyzer/Cargo.lock src/tools/cargo/Cargo.lock find vendor -name .cargo-checksum.json -execdir "$scriptdir/debian/prune-checksums" "{}" + @@ -30,10 +31,14 @@ cargo update --offline # re-generate src/tools/rust-analyzer/Cargo.lock after patching ( cd src/tools/rust-analyzer && cargo update --offline ) +# re-generate src/tools/cargo/Cargo.lock after patching +( cd src/tools/cargo && cargo update --offline ) + needed_crates() { cat Cargo.lock \ src/bootstrap/Cargo.lock \ src/tools/rust-analyzer/Cargo.lock \ + src/tools/cargo/Cargo.lock \ | sed -z -e 's/\nname = /name = /g' -e 's/\nversion = /version = /g' \ | sed -ne 's/\[\[package\]\]name = "\(.*\)"version = "\(.*\)"/\1 \2/gp' } -- 2.39.2