grab-merge: Use wget -nv rather than -q, so that we see error messages

(LP: #881967)
This commit is contained in:
Stefano Rivera 2011-11-12 23:05:15 +02:00
parent da18852892
commit 3910b88ee9
2 changed files with 9 additions and 2 deletions

7
debian/changelog vendored
View File

@ -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 <stefanor@debian.org> Sat, 12 Nov 2011 23:04:35 +0200
ubuntu-dev-tools (0.134) unstable; urgency=low
[ Stefano Rivera ]

View File

@ -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