[Qa-jenkins-scm] [jenkins.debian.net] 02/02: bin/find_dpkg_trigger_cycles.sh: improve curl error reporting

[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 11b16bf7be3e0509749ac9d5f560e85f7278b4fd
Author: Johannes 'josch' Schauer <josch at mister-muffin.de>
Date:   Thu Feb 11 12:55:16 2016 +0100

    bin/find_dpkg_trigger_cycles.sh: improve curl error reporting
---
 bin/find_dpkg_trigger_cycles.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/bin/find_dpkg_trigger_cycles.sh b/bin/find_dpkg_trigger_cycles.sh
index 14416a8..ce78f49 100755
--- a/bin/find_dpkg_trigger_cycles.sh
+++ b/bin/find_dpkg_trigger_cycles.sh
@@ -187,7 +187,9 @@ curl --retry 3 --retry-delay 10 --globoff "http://binarycontrol.debian.net/?q=&p
 	#
 	# curl is allowed to fail with exit status 23 because we want to stop
 	# downloading immediately after control.tar.gz has been extracted
-	( curl --retry 3 --retry-delay 10 --location --silent "$url" || [ "$?" -eq 23 ] || ( echo "curl failed">&2 && exec /srv/jenkins/bin/abort.sh ) ) \
+	( curl --retry 3 --retry-delay 10 --location --silent "$url" \
+			|| { err="$?" && [ "$err" -eq 23 ]; } \
+			|| ( echo "curl failed downloading $url for $pkg with exit $err">&2 && exec /srv/jenkins/bin/abort.sh ) ) \
 		| dpkg-deb --ctrl-tarfile /dev/stdin \
 		| tar -C "$tmpdir" --exclude=./md5sums -x
 	if [ ! -f "$tmpdir/triggers" ]; then

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