summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2017-03-30 16:05:53 +0200
committerHolger Levsen <holger@layer-acht.org>2017-03-30 16:05:53 +0200
commit247041e2bd3abdc7b710cd85aef46f07f4903459 (patch)
tree2129c291498202013cb3c3e768a137b4a8f63699
parent78b9d89255d2ef297e1098de41b3b54babe42da1 (diff)
downloadjenkins.debian.net-247041e2bd3abdc7b710cd85aef46f07f4903459.tar.xz
reproducible Debian: dont (re-)install pbuilder if it's on hold
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xupdate_jdn.sh17
1 files changed, 10 insertions, 7 deletions
diff --git a/update_jdn.sh b/update_jdn.sh
index b8eaa007..85505236 100755
--- a/update_jdn.sh
+++ b/update_jdn.sh
@@ -486,13 +486,16 @@ if [ -f /etc/debian_version ] ; then
fi
$UP2DATE || ( sudo cp --preserve=mode,timestamps -r hosts/$HOSTNAME/etc/apt/sources.list /etc/apt ; sudo apt-get update )
$UP2DATE || sudo apt-get install $DEBS $MASTERDEBS
- case $HOSTNAME in
- codethink*) $UP2DATE || sudo apt-get install -t jessie-backports pbuilder
- ;;
- *) $UP2DATE || sudo apt-get install -t jessie-backports \
- pbuilder lintian || echo "this should only fail on the first install"
- ;;
- esac
+ # dont (re-)install pbuilder if it's on hold
+ if [ ! -n "$(dpkg -l pbuilder | egrep '^hi.*pbuilder')" ] ; then
+ case $HOSTNAME in
+ codethink*) $UP2DATE || sudo apt-get install -t jessie-backports pbuilder
+ ;;
+ *) $UP2DATE || sudo apt-get install -t jessie-backports \
+ pbuilder lintian || echo "this should only fail on the first install"
+ ;;
+ esac
+ fi
# we need mock from bpo to build current fedora
if [ "$HOSTNAME" = "profitbricks-build3-amd64" ] || [ "$HOSTNAME" = "profitbricks-build4-amd64" ] || [ "$HOSTNAME" = "jenkins" ] ; then
$UP2DATE || sudo apt-get install -t jessie-backports mock \