pbuilderrc: use PBUILDER_OPERATION instead of undocumented PBCURRENTCOMMANDLINEOPERATION

Signed-off-by: Holger Levsen <holger@layer-acht.org>

31 files changed, 186 insertions, 186 deletions

diff --git a/hosts/bbx15-armhf-rb/etc/pbuilderrc b/hosts/bbx15-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/bbx15-armhf-rb/etc/pbuilderrc
+++ b/hosts/bbx15-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/bpi0-armhf-rb/etc/pbuilderrc b/hosts/bpi0-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/bpi0-armhf-rb/etc/pbuilderrc
+++ b/hosts/bpi0-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/cb3a-armhf-rb/etc/pbuilderrc b/hosts/cb3a-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/cb3a-armhf-rb/etc/pbuilderrc
+++ b/hosts/cb3a-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/cbxi4a-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4a-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/cbxi4b-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4b-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
+++ b/hosts/cbxi4pro0-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/ff2a-armhf-rb/etc/pbuilderrc b/hosts/ff2a-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/ff2a-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff2a-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/ff2b-armhf-rb/etc/pbuilderrc b/hosts/ff2b-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/ff2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff2b-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/ff4a-armhf-rb/etc/pbuilderrc b/hosts/ff4a-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/ff4a-armhf-rb/etc/pbuilderrc
+++ b/hosts/ff4a-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/hb0-armhf-rb/etc/pbuilderrc b/hosts/hb0-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/hb0-armhf-rb/etc/pbuilderrc
+++ b/hosts/hb0-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/jenkins-test-vm/etc/pbuilderrc b/hosts/jenkins-test-vm/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/jenkins-test-vm/etc/pbuilderrc
+++ b/hosts/jenkins-test-vm/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/jenkins/etc/pbuilderrc b/hosts/jenkins/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/jenkins/etc/pbuilderrc
+++ b/hosts/jenkins/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/odu3a-armhf-rb/etc/pbuilderrc b/hosts/odu3a-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/odu3a-armhf-rb/etc/pbuilderrc
+++ b/hosts/odu3a-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/odxu4-armhf-rb/etc/pbuilderrc b/hosts/odxu4-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/odxu4-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/odxu4b-armhf-rb/etc/pbuilderrc b/hosts/odxu4b-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/odxu4b-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4b-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/odxu4c-armhf-rb/etc/pbuilderrc b/hosts/odxu4c-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/odxu4c-armhf-rb/etc/pbuilderrc
+++ b/hosts/odxu4c-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/opi2a-armhf-rb/etc/pbuilderrc b/hosts/opi2a-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/opi2a-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2a-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/opi2b-armhf-rb/etc/pbuilderrc b/hosts/opi2b-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/opi2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2b-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/opi2c-armhf-rb/etc/pbuilderrc b/hosts/opi2c-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/opi2c-armhf-rb/etc/pbuilderrc
+++ b/hosts/opi2c-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build1-amd64/etc/pbuilderrc b/hosts/profitbricks-build1-amd64/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build1-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build1-amd64/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build10-amd64/etc/pbuilderrc b/hosts/profitbricks-build10-amd64/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build10-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build10-amd64/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build2-i386/etc/pbuilderrc b/hosts/profitbricks-build2-i386/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build2-i386/etc/pbuilderrc
+++ b/hosts/profitbricks-build2-i386/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build3-amd64/etc/pbuilderrc b/hosts/profitbricks-build3-amd64/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build3-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build3-amd64/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build4-amd64/etc/pbuilderrc b/hosts/profitbricks-build4-amd64/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build4-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build4-amd64/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build5-amd64/etc/pbuilderrc b/hosts/profitbricks-build5-amd64/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build5-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build5-amd64/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build6-i386/etc/pbuilderrc b/hosts/profitbricks-build6-i386/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build6-i386/etc/pbuilderrc
+++ b/hosts/profitbricks-build6-i386/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/profitbricks-build9-amd64/etc/pbuilderrc b/hosts/profitbricks-build9-amd64/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/profitbricks-build9-amd64/etc/pbuilderrc
+++ b/hosts/profitbricks-build9-amd64/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/rpi2b-armhf-rb/etc/pbuilderrc b/hosts/rpi2b-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/rpi2b-armhf-rb/etc/pbuilderrc
+++ b/hosts/rpi2b-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/rpi2c-armhf-rb/etc/pbuilderrc b/hosts/rpi2c-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/rpi2c-armhf-rb/etc/pbuilderrc
+++ b/hosts/rpi2c-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/wbd0-armhf-rb/etc/pbuilderrc b/hosts/wbd0-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/wbd0-armhf-rb/etc/pbuilderrc
+++ b/hosts/wbd0-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi
diff --git a/hosts/wbq0-armhf-rb/etc/pbuilderrc b/hosts/wbq0-armhf-rb/etc/pbuilderrc
index dea83aaf..2e8e4074 100644
--- a/hosts/wbq0-armhf-rb/etc/pbuilderrc
+++ b/hosts/wbq0-armhf-rb/etc/pbuilderrc
@@ -6,7 +6,7 @@
 # read pbuilderrc.5 document for notes on specific options.
 #
 # cater for different locations
-case $HOSTNAME in 
+case $HOSTNAME in
 	jenkins|jenkins-test-vm|profitbricks-build*)					MIRRORSITE=http://ftp.de.debian.org/debian ;;
 	bbx15|bpi0|cbxi4*|cb3*|hb0|wbq0|odxu4*|odu3*|wbd0|rpi2*|ff2*|ff4*|opi2*)	MIRRORSITE=http://ftp.us.debian.org/debian ;;
 	*)										echo "unsupported host, exiting." ; exit 1 ;;
@@ -42,10 +42,10 @@ fi
 # needed to ignore failures due to running 398 days in the future…
 # (only on those 2 nodes running in the future…)
 if [ "$HOSTNAME" = "profitbricks-build5-amd64" ] || [ "$HOSTNAME" = "profitbricks-build6-i386" ] ; then
-	case "$PBCURRENTCOMMANDLINEOPERATION" in
-		--create|create)
-					APTGETOPT=(-o Acquire::Check-Valid-Until="false")
-					;;
-		*)			;;
+	case "$PBUILDER_OPERATION" in
+		create)
+			APTGETOPT=(-o Acquire::Check-Valid-Until="false")
+			;;
+		*)	;;
 	esac
 fi