From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 8 Mar 2011 21:57:15 +0000 (+0100)
Subject: Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c9e2c7c7755ec4c706f672120547647306f82fe7;hp=4de40902223f28face536ebdfb5f00bec04b9294;p=dak.git

Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  bugfixes
  Contents: support override suites.
---

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index a4190637..692101bc 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -525,16 +525,11 @@ function compress() {
     cd $base/backup/
     find -maxdepth 1 -mindepth 1 -type f -name 'dump_pre_*' -mtime +2 -print0 | xargs -0 --no-run-if-empty rm
 
-    find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' \! -name '*.xz' -mmin +720 |
-    while read dumpname; do
-        echo "Compressing $dumpname"
-        bzip2 -9fv "$dumpname"
-    done
-    find -maxdepth 1 -mindepth 1 -type f -name "dumpall_*" \! -name '*.bz2' \! -name '*.gz' \! -name '*.xz' -mmin +720 |
-    while read dumpname; do
-        echo "Compressing $dumpname"
-        bzip2 -9fv "$dumpname"
-    done
+    find -maxdepth 1 -mindepth 1 -type f -name 'dump_*' \! -name '*.bz2' \! -name '*.gz' \! -name '*.xz' -mmin +720 -print0 \
+        | xargs --no-run-if-empty -0 -P4 -n16 xz -9v
+
+    find -maxdepth 1 -mindepth 1 -type f -name "dumpall_*" \! -name '*.bz2' \! -name '*.gz' \! -name '*.xz' -mmin +720 \
+        | xargs --no-run-if-empty -0 -P4 -n16 xz -9v
     finddup -l -d $base/backup
 }