Mercurial > gnulib
changeset 17753:c91f916e943e
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 <mathieu@anquetin.eu>
| author | Mathieu Anquetin <mathieu@anquetin.eu> |
|---|---|
| date | Thu, 04 Sep 2014 08:54:48 +0200 |
| parents | 89ba0beadf6a |
| children | 763375bb6b33 |
| files | ChangeLog gnulib-tool |
| diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 04 13:11:04 2014 -0600 +++ b/ChangeLog Thu Sep 04 08:54:48 2014 +0200 @@ -1,3 +1,8 @@ +2014-09-05 Mathieu Anquetin <mathieu@anquetin.eu> + + Trivial change. + * gnulib-tool: Fallback to wget when rsync of PO files fails. + 2014-09-04 Eric Blake <eblake@redhat.com> maintainer-makefile: add syntax check for useless ';;'
--- a/gnulib-tool Thu Sep 04 13:11:04 2014 -0600 +++ b/gnulib-tool Thu Sep 04 08:54:48 2014 +0200 @@ -5029,10 +5029,10 @@ && { # 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