From c83b8970990405a5f97da2870c408ea67520afec Mon Sep 17 00:00:00 2001 From: Mathieu Anquetin Date: Thu, 4 Sep 2014 08:54:48 +0200 Subject: [PATCH] gnulib-tool: Fallback to wget when rsync fails Current implementation only tries to rsync PO files when rsync is installed on the host. In case of error, no files are downloaded even if they are available. This leads to bootstrap problems for hosts that lie behind a restrictive firewall. This patch always tries to rsync by default, falling back to wget if an error occurs. Signed-off-by: Mathieu Anquetin --- ChangeLog | 5 +++++ gnulib-tool | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index d9c51262d5..f5bae5156c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2014-09-05 Mathieu Anquetin + + Trivial change. + * gnulib-tool: Fallback to wget when rsync of PO files fails. + 2014-09-04 Eric Blake maintainer-makefile: add syntax check for useless ';;' diff --git a/gnulib-tool b/gnulib-tool index 73539204b8..5031041ad2 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -5029,10 +5029,10 @@ s,//*$,/,' && { # Prefer rsync over wget if it is available, since it consumes # less network bandwidth, due to compression. if type rsync 2>/dev/null | grep / > /dev/null; then - rsync -Lrtz "${TP_RSYNC_URI}gnulib/" . - else - wget --no-verbose -r -l1 -nd -np -A.po "${TP_URL}gnulib/" + rsync -Lrtz "${TP_RSYNC_URI}gnulib/" . && return fi + + wget --no-verbose -r -l1 -nd -np -A.po "${TP_URL}gnulib/" } ) else -- 2.39.5