From: Joerg Jaspert Date: Thu, 29 Oct 2009 13:39:30 +0000 (+0100) Subject: Merge branch 'merge' X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1ff93a0bc08432270fde894e075f81fc1cd6841a;hp=13d43c235142455d89be358bfb4648d91bb154d7;p=dak.git Merge branch 'merge' * merge: Use the same session when getting pool entries, otherwise we can't do poolfile.location Hide SystemError, otherwise logging gets ugly. Don't reject orig tarballs - we want them --- diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall index 1c9fa5af..200c7a64 100755 --- 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 5ab9d8b8..34f0c64a 100755 --- 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 4222c0cf..7e4b0058 100755 --- 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 e531a241..d6bd125b 100644 --- a/docs/README.quotes +++ b/docs/README.quotes @@ -367,3 +367,10 @@ Canadians: This is a lighthouse. Your call. mhy: Error: "!!!11111iiiiiioneoneoneone" is not a valid command. dak: oh shut up mhy: Error: "oh" is not a valid command. + +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% + + hey, I think something's wrong with your git repo + when I git pulled this last time, I got something that looked almost like python instead of dak + sgran: slander + 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 0a004f38..67db5516 100755 --- 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 b9d31a02..c16fde6a 100755 --- 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 19363f1f..231f7f8c 100755 --- 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 a0abaa1f..41e8727c 100755 --- 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 .new-maintainers.gz + gzip --rsyncable -9v .new-maintainers.gz mv -f .new-maintainers.gz Maintainers.gz elif [ $rc = 0 ] ; then echo '(same as before)'