[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible Debian: refactor

[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 73cf553612b2b74c487e61d6a2aa6fe3f0b34df1
Author: Holger Levsen <holger at layer-acht.org>
Date:   Mon Oct 17 10:47:52 2016 +0200

    reproducible Debian: refactor
---
 bin/reproducible_common.sh               | 1 +
 bin/reproducible_create_meta_pkg_sets.sh | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh
index 3ab81c8..f65dcf0 100755
--- a/bin/reproducible_common.sh
+++ b/bin/reproducible_common.sh
@@ -547,6 +547,7 @@ irc_message() {
 	local CHANNEL="$1"
 	shift
 	local MESSAGE="$@"
+	echo "Sending '$MESSAGE' to $CHANNEL now."
 	kgb-client --conf /srv/jenkins/kgb/$CHANNEL.conf --relay-msg "$MESSAGE" || true # don't fail the whole job
 }
 
diff --git a/bin/reproducible_create_meta_pkg_sets.sh b/bin/reproducible_create_meta_pkg_sets.sh
index 00999d2..d353a29 100755
--- a/bin/reproducible_create_meta_pkg_sets.sh
+++ b/bin/reproducible_create_meta_pkg_sets.sh
@@ -113,7 +113,6 @@ get_installable_set() {
 	if [ $RESULT -ne 0 ] ; then
 		rm -f $TMPFILE
 		MESSAGE="Warning: dose-deb-coinstall cannot calculate the installable set for $1"
-		echo $MESSAGE
 		irc_message debian-reproducible $MESSAGE
 		dose-deb-coinstall --explain --failures --deb-native-arch=$ARCH --bg=$PACKAGES --fg=${TMPFILE2}
 		ABORT=true
@@ -400,7 +399,6 @@ update_pkg_sets() {
 			update_if_similar ${META_PKGSET[20]}.pkgset
 		else
 			MESSAGE="Warning: could not download grml's latest dpkg.selections file, skipping pkg set..."
-			echo $MESSAGE
 			irc_message debian-reproducible $MESSAGE
 			ABORT=true
 		fi
@@ -430,7 +428,6 @@ update_pkg_sets() {
 			update_if_similar ${META_PKGSET[22]}.pkgset
 		else
 			MESSAGE="Warning: could not download tail's latest packages file(s), skipping tails pkg set..."
-			echo $MESSAGE
 			irc_message debian-reproducible $MESSAGE
 			ABORT=true
 		fi

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