Mercurial > gnulib
changeset 39755:85ed74c53d39
bootstrap, gnulib-tool: fix translations rsync
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.
| author | Colin Watson <cjwatson@debian.org> |
|---|---|
| date | Thu, 26 Jul 2018 17:53:37 -0700 |
| parents | 3e1681773a0c |
| children | ac6c51f30806 |
| files | build-aux/bootstrap gnulib-tool pygnulib/GLImport.py |
| diffstat | 3 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/bootstrap Wed Jul 25 08:02:40 2018 -0700 +++ b/build-aux/bootstrap Thu Jul 26 17:53:37 2018 -0700 @@ -168,7 +168,7 @@ # 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).
--- a/gnulib-tool Wed Jul 25 08:02:40 2018 -0700 +++ b/gnulib-tool Thu Jul 26 17:53:37 2018 -0700 @@ -5422,7 +5422,7 @@ && { # 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/"
--- a/pygnulib/GLImport.py Wed Jul 25 08:02:40 2018 -0700 +++ b/pygnulib/GLImport.py Thu Jul 26 17:53:37 2018 -0700 @@ -1207,7 +1207,7 @@ 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', '.',