diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rwxr-xr-x | build-aux/bootstrap | 12 | ||||
| -rwxr-xr-x | gnulib-tool | 10 | ||||
| -rw-r--r-- | pygnulib/GLImport.py | 13 |
4 files changed, 13 insertions, 30 deletions
@@ -1,5 +1,13 @@ 2018-10-07 Benno Schulenberg <bensberg@telfort.nl> + bootstrap, gnulib-tool: use https instead of insecure rsync + * build-aux/bootstrap (download_po_files, po_download_command_format): + Don't try using rsync; always use wget over https to fetch PO files. + * gnulib-tool (func_import): Likewise. + * pygnulib/GLImport.py (GLImport.execute): Likewise. + +2018-10-07 Benno Schulenberg <bensberg@telfort.nl> + bootstrap, gnulib-tool: correct the translations wget command * build-aux/bootstrap (po_download_command_format2): Restrict recursion to a single level. diff --git a/build-aux/bootstrap b/build-aux/bootstrap index 4a37ed0d08..cde39f4e75 100755 --- a/build-aux/bootstrap +++ b/build-aux/bootstrap @@ -164,15 +164,8 @@ bootstrap_epilogue() { :; } # The command to download all .po files for a specified domain into # a specified directory. Fill in the first %s is the domain name, and -# the second with the destination directory. Use rsync's -L and -r -# options because the latest/%s directory and the .po files within are -# all symlinks. +# the second with the destination directory. po_download_command_format=\ -"rsync --include '*.po' --exclude '*' -Lrtvz \ - 'translationproject.org::tp/latest/%s/' '%s'" - -# Fallback for downloading .po files (if rsync fails). -po_download_command_format2=\ "wget --mirror --level=1 -nd -q -A.po -P '%s' \ https://translationproject.org/latest/%s/" @@ -742,9 +735,6 @@ 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 HTTPS. - cmd=$(printf "$po_download_command_format2" "$subdir" "$domain") eval "$cmd" } diff --git a/gnulib-tool b/gnulib-tool index 2bae028c86..c639f5acea 100755 --- a/gnulib-tool +++ b/gnulib-tool @@ -5431,18 +5431,10 @@ s,//*$,/,' fi # Fetch PO files. TP_URL="https://translationproject.org/latest/" - TP_RSYNC_URI="translationproject.org::tp/latest/" if $doit; then echo "Fetching gnulib PO files from $TP_URL" (cd "$destdir"/$pobase \ - && { # 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 --include "*.po" --exclude "*" -Lrtz "${TP_RSYNC_URI}gnulib/" . && return - fi - - wget --no-verbose --mirror --level=1 -nd -A.po -P . "${TP_URL}gnulib/" - } + && wget --no-verbose --mirror --level=1 -nd -A.po -P . "${TP_URL}gnulib/" ) else echo "Fetch gnulib PO files from $TP_URL" diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py index 3b4729ee7c..19ade5e8d1 100644 --- a/pygnulib/GLImport.py +++ b/pygnulib/GLImport.py @@ -1200,19 +1200,12 @@ AC_DEFUN([%s_FILE_LIST], [\n''' % macro_prefix # Fetch PO files. TP_URL = 'https://translationproject.org/latest/' - TP_RSYNC_URI = 'translationproject.org::tp/latest/' if not self.config['dryrun']: print('Fetching gnulib PO files from %s' % TP_URL) os.chdir(joinpath(destdir, pobase)) - cmd = 'type rsync 2>/dev/null | grep / > /dev/null' - result = sp.call(cmd, shell=True) - if result == 0: # use rsync - 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', '--level=1', '-nd', '-A.po', '-P', '.', - '%sgnulib/' % TP_URL] - sp.call(args, shell=True) + args = ['wget', '--no-verbose', '--mirror', '--level=1', '-nd', '-A.po', '-P', '.', + '%sgnulib/' % TP_URL] + sp.call(args, shell=True) else: # if self.config['dryrun'] print('Fetch gnulib PO files from %s' % TP_URL) |