[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: relax regex to match 'dpkg -l' output as it has changed slightly in sid

[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 274be728e842224a04957b0ce593810314c12aab
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Nov 27 20:54:10 2015 +0100

    reproducible: relax regex to match 'dpkg -l' output as it has changed slightly in sid
---
 bin/reproducible_setup_pbuilder.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 7ff584c..23baa1e 100755
--- a/bin/reproducible_setup_pbuilder.sh
+++ b/bin/reproducible_setup_pbuilder.sh
@@ -110,7 +110,7 @@ setup_pbuilder() {
 	echo
 	echo "Now let's see whether the correct packages where installed..."
 	for PKG in ${PACKAGES} ; do
-		grep "http://reproducible.alioth.debian.org/debian/ ./ Packages" ${LOG} \
+		egrep "http://reproducible.alioth.debian.org/debian(/|) ./ Packages" ${LOG} \
 			| grep -v grep | grep "${PKG} " \
 			|| ( echo ; echo "Package ${PKG} is not installed at all or probably rather not in our version, so removing the chroot and exiting now." ; sudo rm -v /var/cache/pbuilder/${NAME}-new.tgz ; rm $TMPFILE $LOG ; exit 1 )
 	done

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