From 3910b88ee9bb2871329fa885f18fcc93874fb772 Mon Sep 17 00:00:00 2001 From: Stefano Rivera Date: Sat, 12 Nov 2011 23:05:15 +0200 Subject: [PATCH] grab-merge: Use wget -nv rather than -q, so that we see error messages (LP: #881967) --- debian/changelog | 7 +++++++ grab-merge | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index e4cb30c..3c196fe 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.135) UNRELEASED; urgency=low + + * grab-merge: Use wget -nv rather than -q, so that we see error messages + (LP: #881967) + + -- Stefano Rivera Sat, 12 Nov 2011 23:04:35 +0200 + ubuntu-dev-tools (0.134) unstable; urgency=low [ Stefano Rivera ] diff --git a/grab-merge b/grab-merge index 4e5372c..f06a1d9 100755 --- a/grab-merge +++ b/grab-merge @@ -59,10 +59,10 @@ fi if [ "$RSYNC" = "y" ]; then URL="merges.ubuntu.com:/srv/patches.ubuntu.com/merges/$HASH/$MERGE/" rsync --verbose --archive --progress --compress --delete \ - "$URL" . || { echo "Error while rsyncing $URL"; exit 1; } + "$URL" . || { echo "Error while rsyncing $URL"; exit 1; } else rm -rf --one-file-system * - wget -q https://merges.ubuntu.com/$HASH/$MERGE/REPORT || { + wget -nv https://merges.ubuntu.com/$HASH/$MERGE/REPORT || { echo "Package not found on merges.ubuntu.com." [ "$CREATED_DIR" != "1" ] || { cd ..; rmdir $MERGE; } exit 1