[Reproducible-commits] [diffoscope] 01/02: Fix path to diffoscope used to generate Recommends

Jérémy Bobbio lunar at moszumanska.debian.org
Fri Sep 4 08:36:20 UTC 2015


This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch master
in repository diffoscope.

commit 225bfe6da1761d14d6016783c8297a152dff5edb
Author: Jérémy Bobbio <lunar at debian.org>
Date:   Fri Sep 4 07:53:51 2015 +0000

    Fix path to diffoscope used to generate Recommends
    
    Let's add a sanity check so this will not happen again while we are at it.
---
 debian/rules | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/rules b/debian/rules
index 0c5ec78..c868422 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,8 +13,10 @@ override_dh_auto_build:
 	dh_auto_build -O--buildsystem=pybuild
 
 override_dh_gencontrol:
-	echo "diffoscope:Recommends=$$(./diffoscope.py --list-tools | tail -n 1 | \
-		sed -e 's/\(^\| \)\(coreutils\|diffutils\|e2fsprogs\|findutils\|gzip\)\(,\|$$\)//g')" >> debian/diffoscope.substvars
+	TOOLS="$$(bin/diffoscope --list-tools | tail -n 1 | \
+		sed -e 's/\(^\| \)\(coreutils\|diffutils\|e2fsprogs\|findutils\|gzip\)\(,\|$$\)//g')"; \
+		[ -n "$$TOOLS" ] || { echo '--list-tools failed' >&2; exit 1; }; \
+		echo "diffoscope:Recommends=$$TOOLS" >> debian/diffoscope.substvars
 	dh_gencontrol -O--buildsystem=pybuild
 
 debian/diffoscope.1: debian/diffoscope.1.rst

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/diffoscope.git



More information about the Reproducible-commits mailing list