reproducible Debian: more refactoring, DRY

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

1 files changed, 153 insertions, 351 deletions

diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 294baef3..d8ba5a5d 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -137,78 +137,58 @@ progress_info_end() {
 }
 
 update_all_build_depends() {
-	local index=$1
 	local src_set=$index
 	let src_srt-=1
 
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[$index]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[$index]}.pkgset ] ; then
-		for PKG in $(cat $TPATH/${META_PKGSET[$src_set]}.pkgset) ; do
-			grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		done
-		packages_list_to_deb822
-		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[$index]}.pkgset
-	fi
+	for PKG in $(cat $TPATH/${META_PKGSET[$src_set]}.pkgset) ; do
+		grep-dctrl -sBuild-Depends -n -X -FPackage $PKG $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
+	done
+	packages_list_to_deb822
+	convert_from_deb822_into_source_packages_only
 }
 
-update_pkg_sets() {
-	# the essential package set
-	progress_info_begin 1
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[1]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[1]}.pkgset ] ; then
+update_pkg_set_specific() {
+	case index in
+		1) # the essential package set
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FEssential yes > $TMPFILE
 		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[1]}.pkgset
-	fi
-	progress_info_end 1
-
-	# the required package set
-	progress_info_begin 2
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[2]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[2]}.pkgset ] ; then
+		;;
+		2) # the required package set
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FPriority required > $TMPFILE
 		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[2]}.pkgset
-	fi
-	progress_info_end 2
-
-	# build-essential
-	progress_info_begin 3
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[3]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[3]}.pkgset ] ; then
+		;;
+		3) # build-essential
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FBuild-Essential yes --or -FPackage build-essential \) > ${TMPFILE2}
 		# here we want the installable set:
 		get_installable_set ${META_PKGSET[3]}.pkgset
 		if [ -f $TMPFILE ] ; then
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[3]}.pkgset
 		fi
-	fi
-	progress_info_end 3
-
-	# build-essential-depends
-	#
-	# This set is created using the following procedure:
-	#
-	#  1. take the binary package build-essential and put it into set S
-	#  2. go over every package in S and
-	#      2.1. if it is a binary package
-	#          2.1.1 add all its strong dependencies to S
-	#          2.1.2 add the source package it builds from to S
-	#      2.2. if it is a source package add all its strong dependencies
-	#           to S
-	#  3. if step 2 added new packages, repeat step 2, otherwise exit
-	#
-	# Strong dependencies are those direct or indirect dependencies of
-	# a package without which the package cannot be installed.
-	#
-	# This set is important because a package can only be trusted if
-	# also all its dependencies, all its build dependencies and
-	# recursively their own dependencies and build dependencies can be
-	# trusted.
-	# So making this set reproducible is required to make anything
-	# in the essential or build-essential set trusted.
-	# Since this is only the strong set, it is a minimal set. In reality
-	# more packages are needed to build build-essential
-	progress_info_begin 4
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[4]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[4]}.pkgset ] ; then
+		;;
+		4) # build-essential-depends
+		#
+		# This set is created using the following procedure:
+		#
+		#  1. take the binary package build-essential and put it into set S
+		#  2. go over every package in S and
+		#      2.1. if it is a binary package
+		#          2.1.1 add all its strong dependencies to S
+		#          2.1.2 add the source package it builds from to S
+		#      2.2. if it is a source package add all its strong dependencies
+		#           to S
+		#  3. if step 2 added new packages, repeat step 2, otherwise exit
+		#
+		# Strong dependencies are those direct or indirect dependencies of
+		# a package without which the package cannot be installed.
+		#
+		# This set is important because a package can only be trusted if
+		# also all its dependencies, all its build dependencies and
+		# recursively their own dependencies and build dependencies can be
+		# trusted.
+		# So making this set reproducible is required to make anything
+		# in the essential or build-essential set trusted.
+		# Since this is only the strong set, it is a minimal set. In reality
+		# more packages are needed to build build-essential
 		grep-dctrl --exact-match --field Package build-essential "$PACKAGES" \
 			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-latest-version - - \
 			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
@@ -216,60 +196,34 @@ update_pkg_sets() {
 			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-buildgraph2packages - "$PACKAGES" \
 			| schroot --directory /tmp -c source:jenkins-reproducible-unstable -- botch-bin2src --deb-native-arch="$ARCH" - "$SOURCES" \
 			| grep-dctrl --no-field-names --show-field=Package '' > $TMPFILE
-		update_if_similar ${META_PKGSET[4]}.pkgset
-	fi
-	progress_info_end 4
-
-	# popcon top 1337 installed sources
-	progress_info_begin 5
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[5]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[5]}.pkgset ] ; then
+		;;
+		5) # popcon top 1337 installed sources
 		SQL_QUERY="SELECT popcon_src.source FROM popcon_src ORDER BY popcon_src.insts DESC LIMIT 1337;"
 		PGPASSWORD=public-udd-mirror \
 			psql -U public-udd-mirror \
 			-h public-udd-mirror.xvm.mit.edu -p 5432 \
 			-t \
 			udd -c"${SQL_QUERY}" > $TMPFILE
-		update_if_similar ${META_PKGSET[5]}.pkgset
-	fi
-	progress_info_end 5
-
-	# key packages (same for all suites)
-	progress_info_begin 6
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[6]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[6]}.pkgset ] ; then
+		;;
+		6) # key packages (same for all suites)
 		SQL_QUERY="SELECT source FROM key_packages;"
 		PGPASSWORD=public-udd-mirror \
 			psql -U public-udd-mirror \
 			-h public-udd-mirror.xvm.mit.edu -p 5432 \
 			-t \
 			udd -c"${SQL_QUERY}" > $TMPFILE
-		update_if_similar ${META_PKGSET[6]}.pkgset
-	fi
-	progress_info_end 6
-
-	# installed on one or more .debian.org machines
-	progress_info_begin 7
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[7]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[7]}.pkgset ] ; then
+		;;
+		7) # installed on one or more .debian.org machines
 		# one day we will get a proper data provider from DSA...
 		# (so far it was a manual "dpkg --get-selections" on all machines
 		# converted into a list of source packages...)
 		cat /srv/jenkins/bin/reproducible_installed_on_debian.org > $TMPFILE
-		update_if_similar ${META_PKGSET[7]}.pkgset
-	fi
-	progress_info_end 7
-
-	# packages which had a DSA
-	progress_info_begin 8
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[8]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[8]}.pkgset ] ; then
-		rm -f ${TMPFILE2}
+		;;
+		8) # packages which had a DSA
 		svn export svn://svn.debian.org/svn/secure-testing/data/DSA/list ${TMPFILE2}
 		grep "^\[" ${TMPFILE2} | grep "DSA-" | cut -d " " -f5 > $TMPFILE
-		update_if_similar ${META_PKGSET[8]}.pkgset
-	fi
-	progress_info_end 8
-
-	# packages from the cii-census
-	progress_info_begin 9
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[9]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[9]}.pkgset ] ; then
+		;;
+		9) # packages from the cii-census
 		CII=$(mktemp --tmpdir=$TEMPDIR pkg-sets-XXXXXXXXX -u)
 		git clone --depth 1 https://github.com/linuxfoundation/cii-census.git $CII
 		csvtool -t ',' col 1 $CII/results.csv | grep -v "project_name" > $TMPFILE
@@ -280,42 +234,29 @@ update_pkg_sets() {
 		done
 		echo "The following unknown packages have been ignored: $MISSES"
 		mv ${TMPFILE2} $TMPFILE
-		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[9]}.pkgset
 		rm $CII -r
-	fi
-	progress_info_end 9
-
-	# gnome and everything it depends on
-	progress_info_begin 10
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[10]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[10]}.pkgset ] ; then
+		convert_from_deb822_into_source_packages_only
+		;;
+		10) # gnome and everything it depends on
+		#
+		# The build-depends of X tasks can be solved once dose-ceve is able to read
+		# Debian source packages (possible in dose3 git but needs a new dose3 release
+		# and upload to unstable)
+		#
+		# Ignoring parsing issues, the current method is unable to resolve virtual
+		# build dependencies
+		#
+		# The current method also ignores Build-Depends-Indep and Build-Depends-Arch
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage gnome \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[10]}.pkgset
 		if [ -f $TMPFILE ] ; then
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[10]}.pkgset
 		fi
-	fi
-	progress_info_end 10
-
-	# The build-depends of X tasks can be solved once dose-ceve is able to read
-	# Debian source packages (possible in dose3 git but needs a new dose3 release
-	# and upload to unstable)
-	#
-	# Ignoring parsing issues, the current method is unable to resolve virtual
-	# build dependencies
-	#
-	# The current method also ignores Build-Depends-Indep and Build-Depends-Arch
-
-	# all build depends of gnome
-	rm -f $TMPFILE
-	progress_info_begin 11
-	update_all_build_depends 11
-	progress_info_end 11
-
-	# kde and everything it depends on
-	progress_info_begin 12
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[12]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[12]}.pkgset ] ; then
+		;;
+		11) # all build depends of gnome
+		update_all_build_depends
+		;;
+		12) # kde and everything it depends on
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage kde-full --or -FPackage kde-standard \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[12]}.pkgset
 		if [ -f $TMPFILE ] ; then
@@ -324,20 +265,12 @@ update_pkg_sets() {
 			# (maybe add the depends of those packages too?)
 			grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-qt-kde@lists.debian.org $SOURCES >> $TMPFILE
 			grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-kde-extras@lists.alioth.debian.org $SOURCES >> $TMPFILE
-			update_if_similar ${META_PKGSET[12]}.pkgset
 		fi
-	fi
-	progress_info_end 12
-
-	# all build depends of kde
-	rm -f $TMPFILE
-	progress_info_begin 13
-	update_all_build_depends 13
-	progress_info_end 13
-
-	# mate and everything it depends on
-	progress_info_begin 14
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[14]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[14]}.pkgset ] ; then
+		;;
+		13) # all build depends of kde
+		update_all_build_depends
+		;;
+		14) # mate and everything it depends on
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage mate-desktop-environment --or -FPackage mate-desktop-environment-extras \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[14]}.pkgset
 		if [ -f $TMPFILE ] ; then
@@ -345,38 +278,22 @@ update_pkg_sets() {
 			# also add the packages maintained by the team
 			# (maybe add the depends of those packages too?)
 			grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-mate-team@lists.alioth.debian.org $SOURCES >> $TMPFILE
-			update_if_similar ${META_PKGSET[14]}.pkgset
 		fi
-	fi
-	progress_info_end 14
-
-	# all build depends of mate
-	progress_info_begin 15
-	rm -f $TMPFILE
-	update_all_build_depends 15
-	progress_info_end 15
-
-	# xfce and everything it depends on
-	progress_info_begin 16
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[16]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[16]}.pkgset ] ; then
+		;;
+		15) # all build depends of mate
+		update_all_build_depends
+		;;
+		16) # xfce and everything it depends on
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage xfce4 \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[16]}.pkgset
 		if [ -f $TMPFILE ] ; then
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[16]}.pkgset
 		fi
-	fi
-	progress_info_end 16
-
-	# all build depends of xfce
-	rm -f $TMPFILE
-	progress_info_begin 17
-	update_all_build_depends 17
-	progress_info_end 17
-
-	# Debian Edu
-	progress_info_begin 18
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[18]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[18]}.pkgset ] ; then
+		;;
+		17) # all build depends of xfce
+		update_all_build_depends
+		;;
+		18) # Debian Edu
 		# all recommends of the education-* packages
 		# (the Debian Edu metapackages don't use depends but recommends…)
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -n -sRecommends -r -FPackage education-*  |sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u > ${TMPFILE}
@@ -389,20 +306,12 @@ update_pkg_sets() {
 		cat ${TMPFILE2} ${TMPFILE3} > $TMPFILE
 		if [ -f $TMPFILE ] ; then
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[18]}.pkgset
 		fi
-	fi
-	progress_info_end 18
-
-	# all build depends of Debian Edu
-	rm -f $TMPFILE
-	progress_info_begin 19
-	update_all_build_depends 19
-	progress_info_end 19
-
-	# freedombox-setup and plinth and everything they depend on
-	progress_info_begin 20
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[20]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[20]}.pkgset ] ; then
+		;;
+		19) # all build depends of Debian Edu
+		update_all_build_depends
+		;;
+		20) # freedombox-setup and plinth and everything they depend on
 		chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X \( -FPriority required --or -FPackage freedombox-setup --or -FPackage plinth \) > ${TMPFILE2}
 		get_installable_set ${META_PKGSET[20]}.pkgset
 		if [ -f $TMPFILE ] ; then
@@ -413,20 +322,12 @@ update_pkg_sets() {
 			for PKG in avahi deluge easy-rsa ejabberd ez-ipupdate firewalld ikiwiki jwchat monkeysphere mumble network-manager ntp obfs4proxy openvpn owncloud php-dropbox php5 postgresql-common privoxy python-letsencrypt quassel roundcube shaarli sqlite3 tor torsocks transmission unattended-upgrades ; do
 				echo $PKG >> $TMPFILE
 			done
-			update_if_similar ${META_PKGSET[20]}.pkgset
 		fi
-	fi
-	progress_info_end 20
-
-	# all build depends of freedombox-setup and plinth
-	rm -f $TMPFILE
-	progress_info_begin 21
-	update_all_build_depends 21
-	progress_info_end 21
-
-	# grml
-	progress_info_begin 22
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[22]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[22]}.pkgset ] ; then
+		;;
+		21) # all build depends of freedombox-setup and plinth
+		update_all_build_depends
+		;;
+		22) # grml
 		URL="http://grml.org/files/grml64-full_latest/dpkg.selections"
 		echo "Downloading $URL now."
 		curl $URL | cut -f1 > $TMPFILE
@@ -434,24 +335,16 @@ update_pkg_sets() {
 			echo "parsing $TMPFILE now..."
 			packages_list_to_deb822
 			convert_from_deb822_into_source_packages_only
-			update_if_similar ${META_PKGSET[22]}.pkgset
 		else
 			MESSAGE="Warning: could not download grml's latest dpkg.selections file, skipping pkg set..."
 			irc_message debian-reproducible $MESSAGE
 			ABORT=true
 		fi
-	fi
-	progress_info_end 22
-
-	# all build depends of grml
-	rm -f $TMPFILE
-	progress_info_begin 23
-	update_all_build_depends 23
-	progress_info_end 23
-
-	# tails
-	progress_info_begin 24
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[24]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[24]}.pkgset ] ; then
+		;;
+		23) # all build depends of grml
+		update_all_build_depends
+		;;
+		24) # tails
 		URL="https://nightly.tails.boum.org/build_Tails_ISO_devel/lastSuccessful/archive/latest.iso.build-manifest"
 		echo "Downloading $URL now."
 		curl $URL > $TMPFILE
@@ -459,189 +352,98 @@ update_pkg_sets() {
 			echo "parsing $TMPFILE now..."
 			tails_build_manifest_to_deb824 "$TMPFILE" "$PACKAGES"
 			convert_from_deb824_into_source_packages_only
-			update_if_similar ${META_PKGSET[24]}.pkgset
 		else
 			MESSAGE="Warning: could not download tail's latest packages file(s), skipping tails pkg set..."
 			irc_message debian-reproducible $MESSAGE
 			ABORT=true
 		fi
-	fi
-	progress_info_end 24
-
-	# all build depends of tails
-	rm -f $TMPFILE
-	progress_info_begin 25
-	update_all_build_depends 25
-	progress_info_end 25
-
-	# installed by Subgraph OS
-	progress_info_begin 26
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[26]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[26]}.pkgset ] ; then
+		;;
+		25) # all build depends of tails
+		update_all_build_depends
+		;;
+		26) # installed by Subgraph OS
 		# one day we will get a proper data provider from Subgraph OSA...
 		# (so far it was a manual "dpkg -l")
 		cat /srv/jenkins/bin/reproducible_installed_by_subgraphos > $TMPFILE
 		packages_list_to_deb822
 		convert_from_deb822_into_source_packages_only
-		update_if_similar ${META_PKGSET[26]}.pkgset
-	fi
-	progress_info_end 26
-
-	# all build depends of Subgraph OS
-	rm -f $TMPFILE
-	progress_info_begin 27
-	update_all_build_depends 27
-	progress_info_end 27
-
-	# debian-boot@l.d.o maintainers
-	progress_info_begin 28
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[28]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[28]}.pkgset ] ; then
+		;;
+		27) # all build depends of Subgraph OS
+		update_all_build_depends
+		;;
+		28) # debian-boot@l.d.o maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-boot@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[28]}.pkgset
-	fi
-	progress_info_end 28
-
-	# Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
-	progress_info_begin 29
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[29]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[29]}.pkgset ] ; then
+		;;
+		29) # Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-med-packaging@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[29]}.pkgset
-	fi
-	progress_info_end 29
-
-	# debian-ocaml-maint@l.d.o maintainers
-	progress_info_begin 30
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[30]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[30]}.pkgset ] ; then
+		;;
+		30) # debian-ocaml-maint@l.d.o maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-ocaml-maint@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[30]}.pkgset
-	fi
-	progress_info_end 30
-
-	# debian python maintainers
-	progress_info_begin 31
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[31]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[31]}.pkgset ] ; then
+		;;
+		31) # debian python maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders python-modules-team@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders python-apps-team@lists.alioth.debian.org $SOURCES >> $TMPFILE
-		update_if_similar ${META_PKGSET[31]}.pkgset
-	fi
-	progress_info_end 31
-
-	# debian-qa maintainers
-	progress_info_begin 32
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[32]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[32]}.pkgset ] ; then
+		;;
+		32) # debian-qa maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders packages@qa.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[32]}.pkgset
-	fi
-	progress_info_end 32
-
-	# Debian Science Team
-	progress_info_begin 33
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[33]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[33]}.pkgset ] ; then
+		;;
+		33) # Debian Science Team
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-science-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[33]}.pkgset
-	fi
-	progress_info_end 33
-
-	# debian-x@l.d.o maintainers
-	progress_info_begin 34
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[34]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[34]}.pkgset ] ; then
+		;;
+		34) # debian-x@l.d.o maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders debian-x@lists.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[34]}.pkgset
-	fi
-	progress_info_end 34
-
-	# lua packages
-	progress_info_begin 35
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[35]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[35]}.pkgset ] ; then
+		;;
+		35) # lua packages
 		grep-dctrl -sPackage -n -FPackage -e ^lua.* $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends dh-lua $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[35]}.pkgset
-	fi
-	progress_info_end 35
-
-	# pkg-fonts-devel
-	progress_info_begin 36
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[36]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[36]}.pkgset ] ; then
+		;;
+		36) # pkg-fonts-devel
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-fonts-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[36]}.pkgset
-	fi
-	progress_info_end 36
-
-	# pkg-games-devel
-	progress_info_begin 37
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[37]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[37]}.pkgset ] ; then
+		;;
+		37) # pkg-games-devel
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-games-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[37]}.pkgset
-	fi
-	progress_info_end 37
-
-	# pkg-golang-maintainers
-	progress_info_begin 38
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[38]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[38]}.pkgset ] ; then
+		;;
+		38) # pkg-golang-maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-golang-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends golang-go $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[38]}.pkgset
-	fi
-	progress_info_end 38
-
-	# pkg-haskell-maintainers
-	progress_info_begin 39
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[39]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[39]}.pkgset ] ; then
+		;;
+		39) # pkg-haskell-maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-haskell-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends ghc $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[39]}.pkgset
-	fi
-	progress_info_end 39
-
-	# pkg-java-maintainers
-	progress_info_begin 40
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[40]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[40]}.pkgset ] ; then
+		;;
+		40) # pkg-java-maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-java-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders openjdk@lists.launchpad.net $SOURCES >> $TMPFILE
 		grep-dctrl -sPackage -n -FBuild-Depends default-jdk -o -FBuild-Depends-Indep default-jdk $SOURCES | sed "s#([^()]*)##g ; s#\[[^][]*\]##g ; s#,##g" | sort -u >> $TMPFILE
-		update_if_similar ${META_PKGSET[40]}.pkgset
-	fi
-	progress_info_end 40
-
-	# pkg-javascript-devel
-	progress_info_begin 41
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[41]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[41]}.pkgset ] ; then
+		;;
+		41) # pkg-javascript-devel
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-javascript-devel@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[41]}.pkgset
-	fi
-	progress_info_end 41
-
-	# pkg-multimedia-maintainers
-	progress_info_begin 42
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[42]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[42]}.pkgset ] ; then
+		;;
+		42) # pkg-multimedia-maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-multimedia-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[42]}.pkgset
-	fi
-	progress_info_end 42
-
-	# pkg-perl-maintainers
-	progress_info_begin 43
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[43]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[43]}.pkgset ] ; then
+		;;
+		43) # pkg-perl-maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-perl-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[43]}.pkgset
-	fi
-	progress_info_end 43
-
-	# pkg-php-pear
-	progress_info_begin 44
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[44]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[44]}.pkgset ] ; then
+		;;
+		44) # pkg-php-pear
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-php-pear@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[44]}.pkgset
-	fi
-	progress_info_end 44
-
-	# pkg-ruby-extras-maintainers
-	progress_info_begin 45
-	if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[45]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[45]}.pkgset ] ; then
+		;;
+		45) # pkg-ruby-extras-maintainers
 		grep-dctrl -sPackage -n -FMaintainer,Uploaders pkg-ruby-extras-maintainers@lists.alioth.debian.org $SOURCES > $TMPFILE
-		update_if_similar ${META_PKGSET[45]}.pkgset
-	fi
-	progress_info_end 45
+		;;
+	esac
+}
 
+update_pkg_sets() {
+	for index in $(seq 0 $1) ; do
+		progress_info_begin $index
+		if [ ! -z $(find $TPATH -maxdepth 1 -mtime +0 -name ${META_PKGSET[$index]}.pkgset) ] || [ ! -f $TPATH/${META_PKGSET[$index]}.pkgset ] ; then
+			update_pkg_set_specific
+			update_if_similar ${META_PKGSET[$index]}.pkgset
+		fi
+		progress_info_end index
+		rm -f $TMPFILE ${TMPFILE2} ${TMPFILE3}
+	done
 }
 
 TMPFILE=$(mktemp --tmpdir=$TEMPDIR pkg-sets-XXXXXXXXX)
@@ -676,13 +478,13 @@ for SUITE in $SUITES ; do
 	echo "$(date -u) - Creating meta package sets for $SUITE now."
 	echo "============================================================================="
 	# finally
-	update_pkg_sets
+	index=0
+	update_pkg_sets 45
 	echo
 	echo "============================================================================="
 	echo "$(date -u) - Done updating all meta package sets for $SUITE."
 done
 
-rm -f $TMPFILE ${TMPFILE2} ${TMPFILE3}
 echo
 
 # abort the job if there are problems we cannot do anything about (except filing bugs! (but these are unrelated to reproducible builds...))