From: Joerg Jaspert <joerg@debian.org>
Date: Tue, 8 Mar 2011 21:35:50 +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=dfa2f059b345fcd07a64f19659ab2c459e960ce1;hp=1429de9bb070fc58a27a7b6e5e86a9f1d8f8a4a4;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:
  Use 'dak contents generate_helper'.
  bugfixes
  Add a new subcommand 'generate_helper' to 'dak contents'.
  Switch to multiprocessing module and reap child gzips.
---

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index be4ed572..a4190637 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -525,12 +525,12 @@ 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' -mmin +720 |
+    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' -mmin +720 |
+    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"