[PATCH] bootstrap, gnulib-tool: fix translations rsync

[Colin Watson]

Previously, we created files such as $pobase/Makefile.in.in and then the
subsequent rsync would immediately delete them.

* build-aux/bootstrap (po_download_command_format): Avoid deleting
non-.po files in target directory when rsyncing translations.
* gnulib-tool (func_import): Likewise.
* pygnulib/GLImport.py (GLImport.execute): Likewise.
---
 build-aux/bootstrap  | 2 +-
 gnulib-tool          | 2 +-
 pygnulib/GLImport.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index ed3b0a4b7..f6720288a 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -165,7 +165,7 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync --delete --exclude '*.s1' -Lrtvz \
+"rsync --include '*.po' --exclude '*' -Lrtvz \
  'translationproject.org::tp/latest/%s/' '%s'"
 
 # Fallback for downloading .po files (if rsync fails).
diff --git a/gnulib-tool b/gnulib-tool
index ebe4443fd..e4a8f834c 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -5422,7 +5422,7 @@ 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 --delete --exclude "*.s1" -Lrtz "${TP_RSYNC_URI}gnulib/" . 
&& return
+              rsync --delete --include "*.po" --exclude "*" -Lrtz 
"${TP_RSYNC_URI}gnulib/" . && return
             fi
 
             wget --no-verbose --mirror -nd -np  -A.po -P . "${TP_URL}gnulib/"
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index a6d080912..b495d2dfe 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -1207,7 +1207,7 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix
                 cmd = 'type rsync 2>/dev/null | grep / > /dev/null'
                 result = sp.call(cmd, shell=True)
                 if result == 0:  # use rsync
-                    args = ['rsync', '--delete', '--exclude', '*.s1', '-Lrtz', 
'%sgnulib/' % TP_RSYNC_URI, '.']
+                    args = ['rsync', '--include', '*.po', '--exclude', '*', 
'-Lrtz', '%sgnulib/' % TP_RSYNC_URI, '.']
                     result = sp.call(args, shell=True)
                 if result != 0:  # use wget
                     args = ['wget', '--no-verbose', '--mirror', '-nd', '-np', 
'-A.po', '-P', '.',
-- 
2.17.1