From 63dd600e196babbb27d3e0814663b8be0dbad703 Mon Sep 17 00:00:00 2001
From: Ximin Luo <infinity0@debian.org>
Date: Mon, 9 Mar 2020 00:29:11 +0000
Subject: [PATCH] debian/prune-unused-deps: fix logic, diff(1) sometimes will
 spread the diff out across stanzas result in bad output

---
 debian/prune-unused-deps | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/prune-unused-deps b/debian/prune-unused-deps
index be863c8dcf..ac43fe6bd1 100755
--- a/debian/prune-unused-deps
+++ b/debian/prune-unused-deps
@@ -17,10 +17,13 @@ test -f Cargo.lock.orig || cp Cargo.lock Cargo.lock.orig
 rm -f Cargo.lock
 ./x.py build nonexistent/path/to/trigger/cargo/metadata src/bootstrap
 
+massage_lock_file() {
+	sed -z -e 's/\nname = /name = /g' -e 's/\nversion = /version = /g' "$1"
+}
+
 not_needed() {
-	diff -ru Cargo.lock.orig Cargo.lock \
-	  | sed -z 's/\n-version/-version/g' \
-	  | sed -ne 's/-name = "\(.*\)"-version = "\(.*\)"/\1 \2/gp'
+	diff -ru <(massage_lock_file Cargo.lock.orig) <(massage_lock_file Cargo.lock) \
+	  | sed -ne 's/-\[\[package\]\]name = "\(.*\)"version = "\(.*\)"/\1 \2/gp'
 }
 
 ghetto_parse_cargo() {