summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-11-27 20:54:10 +0100
committerHolger Levsen <holger@layer-acht.org>2015-11-27 20:54:10 +0100
commit274be728e842224a04957b0ce593810314c12aab (patch)
treeb8deffa14be52d0472f3eb719bdd43240b385a8d
parent94e4b2c4f9e9e7099ddc07c9efc09543ec056baa (diff)
downloadjenkins.debian.net-274be728e842224a04957b0ce593810314c12aab.tar.xz
reproducible: relax regex to match 'dpkg -l' output as it has changed slightly in sid
-rwxr-xr-xbin/reproducible_setup_pbuilder.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/reproducible_setup_pbuilder.sh b/bin/reproducible_setup_pbuilder.sh
index 7ff584cd..23baa1ee 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