[Git][ftp-team/dak][master] 6 commits: Use xz compression for Translation indices in unstable/experimental

Joerg Jaspert pushed to branch master at Debian FTP Team / dak

Commits:

e80814ef

by Julian Andres Klode at 2019-07-11T18:23:54+02:00

Use xz compression for Translation indices in unstable/experimental

Closes: #930103

038b08f4
by Julian Andres Klode at 2019-07-11T18:31:01+02:00
```
Fix NameError suite
```
0fa1e37e
by Julian Andres Klode at 2019-07-11T16:45:36+00:00
```
Apply suggestion to config/debian/dinstall.functions
```

61a16e02

by Julian Andres Klode at 2019-07-11T18:45:58+02:00

Don't override compression in filewriter

We get the compression value from the table

44b29586

by Julian Andres Klode at 2019-07-11T18:45:58+02:00

generate-i18n-Index: set -o nullglob to handle missing files

8b61bb0d

by Joerg Jaspert at 2020-04-10T23:01:13+02:00

Merge branch 'xz-translations'

* xz-translations:
  generate-i18n-Index: set -o nullglob to handle missing files
  Don't override compression in filewriter
  Apply suggestion to config/debian/dinstall.functions
  Fix NameError suite
  Use xz compression for Translation indices in unstable/experimental

Changes:

config/debian/dinstall.functions

@@ -73,7 +73,7 @@ function i18n1() {
                  for dir in ${extimportdists}; do
                      if [[ -d dists/${dir}/  ]]; then
                          cd dists/${dir}/main/i18n
 -                        rsync -aq --delete --delete-after --exclude by-hash --exclude Translation-en.bz2 --exclude "Translation-*.diff/" . ${ftpdir}/dists/${dir}/main/i18n/.
 +                        rsync -aq --delete --delete-after --exclude by-hash --exclude "Translation-en.*" --exclude "Translation-*.diff/" . ${ftpdir}/dists/${dir}/main/i18n/.
                      fi
                      cd ${scriptdir}/i18nsync
                  done

scripts/debian/ddtp-i18n-check.sh

@@ -104,7 +104,7 @@ unset TEMP_WORK_DIR
  # If it's trapped, something bad happened.
  trap_exit () {
  	rm -rf "$TMP_WORK_DIR"
 -	rm -f "$dists_parent_dir"/dists/*/main/i18n/Translation-*.bz2
 +	rm -f "$dists_parent_dir"/dists/*/main/i18n/Translation-*
  	rm -f "$dists_parent_dir"/dists/*/main/i18n/Index
  	exit 1
+ }

scripts/debian/generate-i18n-Index

@@ -12,6 +12,7 @@
  set -e
  set -u
 +set -o nullglob
  export LC_ALL=C
  usage () {
@@ -43,7 +44,7 @@ trap trap_exit EXIT HUP INT QUIT TERM
  exec 3>Index
  echo "SHA1:" >&3
 -for file in Translation-*.bz2 ; do
 +for file in Translation-*.bz2 Translation-*.xz ; do
  	sha=$(sha1sum "$file"); sha="${sha%% *}"
  	size=$(stat -c %s "${file}")
  	printf ' %s % 7s %s\n' "$sha" "$size" "$file" >&3