[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: prefer packages which were triggered

[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 05289007632c577b8e848e167ab09c86eae8ace8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Dec 1 10:53:19 2017 +0000

    reproducible Arch Linux: prefer packages which were triggered
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_build_archlinux_pkg.sh | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/bin/reproducible_build_archlinux_pkg.sh b/bin/reproducible_build_archlinux_pkg.sh
index 951f6d9..fb4ca36 100755
--- a/bin/reproducible_build_archlinux_pkg.sh
+++ b/bin/reproducible_build_archlinux_pkg.sh
@@ -55,25 +55,28 @@ choose_package() {
 				break
 			fi
 		done
-		# if we broke out of the previous loop we have choosen a package
 		if [ ! -z "$SRCPACKAGE" ] ; then
 			break
 		fi
-		# trz to find packages which never been built before
-		for PKG in $(cat ${ARCHLINUX_PKGS}_$REPO | cut -d ' ' -f1 | sort -R | xargs echo ) ; do
-			# if new...
-			if [ ! -d $BASE/archlinux/$REPO/$PKG ] ; then
-				REPOSITORY=$REPO
-				SRCPACKAGE=$PKG
-				# break out of the loop (and then out of the next loop too...)
+	done
+	if [ -z "$SRCPACKAGE" ] ; then
+		for REPO in $(echo $ARCHLINUX_REPOS | sed -s "s# #\n#g" | sort -R | xargs echo ); do
+			# trz to find packages which never been built before
+			for PKG in $(cat ${ARCHLINUX_PKGS}_$REPO | cut -d ' ' -f1 | sort -R | xargs echo ) ; do
+				# if new...
+				if [ ! -d $BASE/archlinux/$REPO/$PKG ] ; then
+					REPOSITORY=$REPO
+					SRCPACKAGE=$PKG
+					# break out of the loop (and then out of the next loop too...)
+					break
+				fi
+			done
+			# again, if we broke out of the previous loop we have choosen a package
+			if [ ! -z "$SRCPACKAGE" ] ; then
 				break
 			fi
 		done
-		# again, if we broke out of the previous loop we have choosen a package
-		if [ ! -z "$SRCPACKAGE" ] ; then
-			break
-		fi
-	done
+	fi
 	if [ -z $SRCPACKAGE ] ; then
 		echo "$(date -u ) - no package found to be build, sleeping 6h."
 		for i in $(seq 1 12) ; do

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