From: Bernhard Voelker <mail@bernhard-voelker.de>
Date: Mon, 5 Sep 2011 11:28:20 +0000 (+0200)
Subject: build: let bootstrap resort to wget for downloading .po files
X-Git-Tag: v0.1~1356
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=feaf4df70588cf1ee30b4879a1048cc143135a67;p=gnulib.git

build: let bootstrap resort to wget for downloading .po files

* build-aux/bootstrap (download_po_files): Fallback to wget when
downloading the .po files via rsync failed.  This is necessary to
bootstrap behind a strict firewall.
---

diff --git a/ChangeLog b/ChangeLog
index 361362bd0..be5b7896a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-12-17  Bernhard Voelker  <mail@bernhard-voelker.de>
+
+	build: let bootstrap resort to wget when downloading .po files
+	* build-aux/bootstrap (download_po_files): Fallback to wget when
+	downloading the .po files via rsync fails.  This is necessary to
+	bootstrap from behind a strict firewall.
+
 2011-12-15  Paul Eggert  <eggert@cs.ucla.edu>
 
 	stdint: don't assume C++11 when compiling with g++
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 3c39f4a52..61e11852d 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -105,6 +105,11 @@ po_download_command_format=\
 "rsync --delete --exclude '*.s1' -Lrtvz \
  'translationproject.org::tp/latest/%s/' '%s'"
 
+# Fallback for downloading .po files (if rsync fails).
+po_download_command_format2=\
+"wget --mirror -nd -q -np -A.po -P '%s' \
+ http://translationproject.org/latest/%s/"
+
 extract_package_name='
   /^AC_INIT(/{
      /.*,.*,.*, */{
@@ -603,6 +608,9 @@ download_po_files() {
   domain=$2
   echo "$me: getting translations into $subdir for $domain..."
   cmd=`printf "$po_download_command_format" "$domain" "$subdir"`
+  eval "$cmd" && return
+  # Fallback to HTTP.
+  cmd=`printf "$po_download_command_format2" "$subdir" "$domain"`
   eval "$cmd"
 }