[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: fix grep-dctrl usage to include all binaries

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 106c21f2e1427b89525bd73db24fa2f9e51290a3
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sun Aug 9 13:51:13 2015 +0200

    reproducible: fix grep-dctrl usage to include all binaries
---
 bin/reproducible_html_repository_comparison.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_html_repository_comparison.sh b/bin/reproducible_html_repository_comparison.sh
index e5a3772..5db70c2 100755
--- a/bin/reproducible_html_repository_comparison.sh
+++ b/bin/reproducible_html_repository_comparison.sh
@@ -116,14 +116,14 @@ for PKG in $SOURCEPKGS ; do
 	if [ ! -z "$BET" ] ; then
 		ONLYALL=true
 		for ARCH in all ${ARCHS} ; do
-			i="$(grep-dctrl -n -s Package -r -FPackage $PKG --and -FVersion $BET --and -FArchitecture $ARCH $PACKAGES|xargs -r echo)"
+			i="$(grep-dctrl -n -s Package \( -X -FPackage $PKG --or -X -FSource $PKG \) --and -FVersion $BET --and -FArchitecture $ARCH $PACKAGES|sort -u|xargs -r echo)"
 			if [ "$ARCH" != "all" ] && [ ! -z "$i" ] ; then
 				ONLYALL=false
 			fi
 			echo "$ARCH: $i"
 		done
 		for ARCH in all ${ARCHS} ; do
-			i="$(grep-dctrl -n -s Package -r -FPackage $PKG --and -FVersion $BET --and -FArchitecture $ARCH $PACKAGES|xargs -r echo)"
+			i="$(grep-dctrl -n -s Package \( -X -FPackage $PKG --or -X -FSource $PKG \) --and -FVersion $BET --and -FArchitecture $ARCH $PACKAGES|sort -u|xargs -r echo)"
 			if [ ! -z "$i" ] ; then
 				i="$ARCH: $i"
 			elif [ -z "$i" ] && [ "$ARCH" != "all" ] && ! $ONLYALL ; then

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git