[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible Arch Linux: conditionally shorten irc message

[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 4a373f6c0edd0bf6c9f81a4802db55459ef70743
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Dec 9 14:29:29 2017 +0000

    reproducible Arch Linux: conditionally shorten irc message
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_archlinux_scheduler.sh | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/bin/reproducible_archlinux_scheduler.sh b/bin/reproducible_archlinux_scheduler.sh
index 3330ae5..f03915d 100755
--- a/bin/reproducible_archlinux_scheduler.sh
+++ b/bin/reproducible_archlinux_scheduler.sh
@@ -74,15 +74,28 @@ update_archlinux_repositories() {
 		find $BASE/archlinux/ -name build1.log -type f -printf '%T+ %p\n' | sort | head -n 250|cut -d " " -f2 | sed -s 's#build1.log$#pkg.needs_build#g' | xargs -r touch
 		# explain, for debugging…
 		find $BASE/archlinux/ -name build1.log -type f -printf '%T+ %p\n' | sort | head -n 250|cut -d "/" -f8-9 | sort | xargs echo "Old packages rescheduled: "
-		old=", plus 250 old ones"
+		old="250 old ones"
 	fi
 	total=$(find $BASE/archlinux/ -name pkg.needs_build | wc -l )
 	rm "$ARCHLINUX_PKGS"_full_pkgbase_list
 	schroot --end-session -c $SESSION
 	new=$(cat $NEW | wc -l 2>/dev/null|| true)
 	updated=$(cat $UPDATED 2>/dev/null| wc -l || true)
-	if [ $new -ne 0 ] || [ $updated -ne 0 ] ; then
-		irc_message archlinux-reproducible "scheduled $new entirely new packages and $updated packages with newer versions$old, for $total scheduled out of $TOTAL."
+	if [ $new -ne 0 ] || [ $updated -ne 0 ] || [ -n "$old" ] ; then
+		message="scheduled"
+		if [ $new -ne 0 ] ; then
+			message="$message $new entirely new packages"
+		fi
+		if [ $new -ne 0 ] && [ $updated -ne 0 ] ; then
+			message="$message and"
+		fi
+		if [ $updated -ne 0 ] ; then
+			message="$message $updated packages with newer versions"
+		fi
+		if [ $new -ne 0 ] || [ $updated -ne 0 ] ; then
+			old=", plus $old"
+		fi
+		irc_message archlinux-reproducible "${message}$old, for $total scheduled out of $TOTAL."
 	fi
 	echo "$(date -u ) - scheduled $new/$updated packages$old."
 	rm $NEW $UPDATED > /dev/null

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