From 57ba754a12bebea5c5bbda2a9876dc8492d19445 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Thu, 30 Apr 2009 22:19:43 +0200 Subject: [PATCH] grab-merge: Output error message in case wget/rsync fails. Not tested for the rsync case! --- debian/changelog | 5 ++++- grab-merge | 6 ++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index fb4f564..8be40ff 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,10 @@ ubuntu-dev-tools (0.73) karmic; urgency=low * requestsync: - Send a "Content-Type: text/plain; charset=UTF-8" header (LP: #246307). - -- Colin Watson Mon, 27 Apr 2009 21:39:15 +0100 + [ Daniel Hahler ] + * grab-merge: Output error message in case wget/rsync fails. + + -- Daniel Hahler Thu, 30 Apr 2009 22:18:38 +0200 ubuntu-dev-tools (0.72) jaunty; urgency=low diff --git a/grab-merge b/grab-merge index 31b967d..855c32e 100755 --- a/grab-merge +++ b/grab-merge @@ -57,15 +57,17 @@ else fi if [ "$RSYNC" = "y" ]; then + URL="merges.ubuntu.com:/srv/patches.ubuntu.com/merges/$HASH/$MERGE/" rsync --verbose --archive --progress --compress --delete \ - merges.ubuntu.com:/srv/patches.ubuntu.com/merges/$HASH/$MERGE/ . + "$URL" . || { echo "Error while rsyncing $URL"; exit 1; } else rm -rf * wget -q https://merges.ubuntu.com/$HASH/$MERGE/REPORT for NAME in $(sed -n -e "/^ /p" REPORT); do echo "Getting $NAME..." - [ -f $NAME ] || wget -q https://merges.ubuntu.com/$HASH/$MERGE/$NAME + URL="https://merges.ubuntu.com/$HASH/$MERGE/$NAME/foo" + wget -q "$URL" || { echo "Error downloading $URL"; exit 1; } done fi echo