Merge branch 'merge'

* merge:
  Catch and log all exceptions from top-level dak command.
  Look in the pool and queues for missing orig files.
  Tidy check_lintian's 'log' closure
  Inline ensure_all_source_exists.

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 1c9fa5afefff3284fd27f860fcb63d40d5aad16d..200c7a646986cbf7b189a1d28a7c2dee3be5773a 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -197,9 +197,6 @@ function accepted() {
 function cruft() {
     log "Checking for cruft in overrides"
     dak check-overrides
-
-    log "Fixing symlinks in $ftpdir"
-    symlinks -d -r $ftpdir
 }
 
 function msfl() {
@@ -252,6 +249,7 @@ function mpfm() {
 function packages() {
     log "Generating Packages and Sources files"
     cd $configdir
+    GZIP='--rsyncable' ; export GZIP
     apt-ftparchive generate apt.conf
 }
 
@@ -905,14 +903,6 @@ GO=(
 )
 stage $GO &
 
-GO=(
-    FUNC="aptftpcleanup"
-    TIME="apt-ftparchive cleanup"
-    ARGS=""
-    ERR="false"
-)
-stage $GO &
-
 GO=(
     FUNC="merkel3"
     TIME="merkel ddaccessible sync"
@@ -927,6 +917,14 @@ GO=(
     ARGS=""
     ERR=""
 )
+stage $GO &
+
+GO=(
+    FUNC="aptftpcleanup"
+    TIME="apt-ftparchive cleanup"
+    ARGS=""
+    ERR="false"
+)
 stage $GO
 
 log "Daily cron scripts successful, all done"

diff --git a/config/debian/cron.weekly b/config/debian/cron.weekly
index 5ab9d8b88a7efcb64f5db92f74ad72c33b3a3ff4..34f0c64a4a535aa04da929ef51c4f408ddd0e371 100755 (executable)
--- a/config/debian/cron.weekly
+++ b/config/debian/cron.weekly
@@ -57,6 +57,9 @@ apt-ftparchive -q clean apt.conf.buildd
 echo "Update wanna-build database dump"
 /org/ftp.debian.org/scripts/nfu/get-w-b-db
 
+echo "Fixing symlinks in $ftpdir"
+symlinks -d -r $ftpdir
+
 echo "Finally, all is done, compressing logfile"
 exec > /dev/null 2>&1
 

diff --git a/dak/generate_index_diffs.py b/dak/generate_index_diffs.py
index 4222c0cf4fb9446b0bc19a7127dab4e9fe4da24e..7e4b0058e335186a26d609ee5e5cb18ad0d6165d 100755 (executable)
--- a/dak/generate_index_diffs.py
+++ b/dak/generate_index_diffs.py
@@ -254,7 +254,7 @@ def genchanges(Options, outdir, oldfile, origfile, maxdiffs = 14):
         if not os.path.isdir(outdir):
             os.mkdir(outdir)
 
-        w = os.popen("diff --ed - %s | gzip -c -9 > %s.gz" %
+        w = os.popen("diff --ed - %s | gzip --rsyncable -c -9 > %s.gz" %
                      (newfile, difffile), "w")
         pipe_file(oldf, w)
         oldf.close()

diff --git a/docs/README.quotes b/docs/README.quotes
index e531a241e5a41723bd2c3098e9c7ff5b797a2fc6..d6bd125b88b62dbd6a550fc7158d0894ea1f8f71 100644 (file)
--- a/docs/README.quotes
+++ b/docs/README.quotes
@@ -367,3 +367,10 @@ Canadians: This is a lighthouse. Your call.
 <dak> mhy: Error: "!!!11111iiiiiioneoneoneone" is not a valid command.
 <mhy> dak: oh shut up
 <dak> mhy: Error: "oh" is not a valid command.
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+<sgran> hey, I think something's wrong with your git repo
+<sgran> when I git pulled this last time, I got something that looked almost like python instead of dak
+<mhy> sgran: slander
+<sgran> sorry, I take it back, I've had a better look now

diff --git a/scripts/debian/byhand-di b/scripts/debian/byhand-di
index 0a004f3899956e22e4f0580dc2f56c126b945879..67db55168ae5f16852447413a94ac418314aad2d 100755 (executable)
--- a/scripts/debian/byhand-di
+++ b/scripts/debian/byhand-di
@@ -95,6 +95,10 @@ mv "$TMPDIR/installer-$ARCH/current"  "$TARGET"
 find "$TARGET/$VERSION" -type d -exec chmod 755 {} +
 find "$TARGET/$VERSION" -type f -exec chmod 644 {} +
 
+# Make sure nothing symlinks outside of the ftpdir
+# Shouldnt happen, but better be sure.
+symlinks -d -r /srv/ftp.debian.org/ftp
+
 trap - EXIT
 cleanup
 

diff --git a/scripts/debian/mkfilesindices b/scripts/debian/mkfilesindices
index b9d31a021bd579e054a15f42024f2f36d4afb981..c16fde6aa77eb4efbe615d1e472cc2947a9c7c9a 100755 (executable)
--- a/scripts/debian/mkfilesindices
+++ b/scripts/debian/mkfilesindices
@@ -27,7 +27,7 @@ echo "Generating sources list..."
   cd $base/ftp
   find ./dists -maxdepth 1 \! -type d
   find ./dists \! -type d | grep "/source/"
-) | sort -u | gzip -9 > source.list.gz
+) | sort -u | gzip --rsyncable -9 > source.list.gz
 
 echo "Generating arch lists..."
 
@@ -39,7 +39,7 @@ for a in $ARCHES; do
    cd $base/ftp
    find ./dists -maxdepth 1 \! -type d
    find ./dists \! -type d | grep -E "(proposed-updates.*_$a.changes$|/main/disks-$a/|/main/installer-$a/|/Contents-$a|/binary-$a/)"
-  ) | sort -u | gzip -9 > arch-$a.list.gz
+  ) | sort -u | gzip --rsyncable -9 > arch-$a.list.gz
 done
 
 echo "Generating suite lists..."
@@ -62,7 +62,7 @@ printf 'SELECT id, suite_name FROM suite\n' | psql -F' ' -At projectb |
       done
      )
      suite_list $id | tr -d ' ' | sed 's,^/srv/ftp.debian.org/ftp,.,'
-    ) | sort -u | gzip -9 > suite-${suite}.list.gz
+    ) | sort -u | gzip --rsyncable -9 > suite-${suite}.list.gz
   done
 
 echo "Finding everything on the ftp site to generate sundries $(date +"%X")..."
@@ -83,7 +83,7 @@ done
 
 (cd $base/ftp/
        for dist in sid squeeze; do
-               find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz
+               find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip --rsyncable -9 > $base/ftp/indices/files/components/translation-$dist.list.gz
        done
 )
 

diff --git a/scripts/debian/mklslar b/scripts/debian/mklslar
index 19363f1f89d43d360132f1975427794ce333ec4e..231f7f8c131782c88e20d5d0d81066590717bd63 100755 (executable)
--- a/scripts/debian/mklslar
+++ b/scripts/debian/mklslar
@@ -26,11 +26,11 @@ if [ -r ${filename}.gz ] ; then
   mv -f ${filename}.gz $filename.old.gz
   mv -f .$filename.new $filename
   rm -f $filename.patch.gz
-  zcat $filename.old.gz | diff -u - $filename | gzip -9cfn - >$filename.patch.gz
+  zcat $filename.old.gz | diff -u - $filename | gzip --rsyncable -9cfn - >$filename.patch.gz
   rm -f $filename.old.gz
 else
   mv -f .$filename.new $filename
 fi
 
-gzip -9cfN $filename >$filename.gz
+gzip --rsyncable -9cfN $filename >$filename.gz
 rm -f $filename

diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers
index a0abaa1f7cf5fac627e022f00bc8ef7475edc38b..41e8727c6b3e267214cea7f63bd8effccb2d6765 100755 (executable)
--- a/scripts/debian/mkmaintainers
+++ b/scripts/debian/mkmaintainers
@@ -17,7 +17,7 @@ set -e
 if [ $rc = 1 ] || [ ! -f Maintainers ] ; then
        echo -n "installing Maintainers ... "
        mv -f .new-maintainers Maintainers
-       gzip -9v <Maintainers >.new-maintainers.gz
+       gzip --rsyncable -9v <Maintainers >.new-maintainers.gz
        mv -f .new-maintainers.gz Maintainers.gz
 elif [ $rc = 0 ] ; then
        echo '(same as before)'