[Qa-jenkins-scm] [jenkins.debian.net] 09/10: reproducible Debian: final refactoring, DRY

[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 67fb472b40eedd71af87a1b01538431f41ec459e
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Nov 8 15:23:19 2016 +0100

    reproducible Debian: final refactoring, DRY
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_create_meta_pkg_sets.sh | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index badc439..fb68bb6 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -148,6 +148,9 @@ use_previous_sets_build_depends() {
 }
 
 update_pkg_set_specific() {
+	#
+	# bin/meta_pkgset.csv defines the names of the packages set and their ordering/numbering
+	#
 	case $index in
 		1)	# the essential package set
 			chdist --data-dir=$CHPATH grep-dctrl-packages $DISTNAME -X -FEssential yes > $TMPFILE
@@ -435,7 +438,8 @@ update_pkg_set_specific() {
 }
 
 update_pkg_sets() {
-	for index in $(seq 1 $1) ; do
+	# loop through all defined package sets…
+	for index in $(seq 1 ${#META_PKGSET[@]}) ; 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
@@ -481,8 +485,8 @@ for SUITE in $SUITES ; do
 	echo "============================================================================="
 	echo "$(date -u) - Creating meta package sets for $SUITE now."
 	echo "============================================================================="
-	# bin/meta_pkgset.csv defines the names of the packages set and their ordering
-	update_pkg_sets 45
+	update_pkg_sets
+
 	echo
 	echo "============================================================================="
 	echo "$(date -u) - Done updating all meta package sets for $SUITE."

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