X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=1834841b74b1ad04505b0aca1e093f63d92af4eb;hb=6cb0b0401eaeeb6900551c20617f0a8f2293cd89;hp=0ad674ea1d39a5cbe2a8a8a8fbbcc888ebebb154;hpb=64f709a508e27db13034026b86f0c794b0574da3;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 0ad674ea..1834841b 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -4,10 +4,14 @@ function ts() { echo "Archive maintenance timestamp ($1): $(date +%H:%M:%S)" } -# Cleanup actions +# Remove all locks +function remove_locks() { + rm -f $LOCK_DAILY $LOCK_ACCEPTED $LOCK_NEW +} + +# trap handler for cleaning up on signal / error function cleanup() { - rm -f ${LOCK_DAILY} - rm -f ${LOCK_ACCEPTED} + remove_locks } # If we error out this one is called, *FOLLOWED* by cleanup above @@ -22,7 +26,11 @@ function onerror() { fi subject="${subject} dinstall error at ${ERRDATE} in ${STAGEFILE} - (Be quiet, Brain, or I'll stab you with a Q-tip)" - cat "${STAGEFILE}.log" | mail -s "${subject}" -a "X-Debian: DAK" cron@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + if [ -r "${STAGEFILE}.log" ]; then + cat "${STAGEFILE}.log" + else + echo "file ${STAGEFILE}.log does not exist, sorry" + fi | mail -s "${subject}" -a "X-Debian: DAK" cron@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org } ######################################################################## @@ -115,7 +123,7 @@ function i18n1() { # Lets check! if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then # Yay, worked, lets copy around - for dir in squeeze sid; do + for dir in wheezy sid; do if [ -d dists/${dir}/ ]; then cd dists/${dir}/main/i18n rsync -aq --delete --delete-after . ${ftpdir}/dists/${dir}/main/i18n/. @@ -199,7 +207,6 @@ function mpfm() { function packages() { log "Generating Packages and Sources files" cd $configdir - GZIP='--rsyncable' ; export GZIP #apt-ftparchive generate apt.conf dak generate-packages-sources } @@ -250,13 +257,13 @@ function mklslar() { 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 --rsyncable -9cfn - >${FILENAME}.patch.gz + zcat ${FILENAME}.old.gz | diff -u - ${FILENAME} | gzip -9cfn - >${FILENAME}.patch.gz rm -f ${FILENAME}.old.gz else mv -f .${FILENAME}.new ${FILENAME} fi - gzip --rsyncable -9cfN ${FILENAME} >${FILENAME}.gz + gzip -9cfN ${FILENAME} >${FILENAME}.gz rm -f ${FILENAME} } @@ -271,7 +278,7 @@ function mkmaintainers() { if ! cmp -s .new-maintainers Maintainers || [ ! -f Maintainers ]; then log "installing Maintainers ... " mv -f .new-maintainers Maintainers - gzip --rsyncable -9v .new-maintainers.gz + gzip -9v .new-maintainers.gz mv -f .new-maintainers.gz Maintainers.gz else rm -f .new-maintainers @@ -289,7 +296,7 @@ function mkuploaders() { if ! cmp -s .new-uploaders Uploaders || [ ! -f Uploaders ]; then log "installing Uploaders ... " mv -f .new-uploaders Uploaders - gzip --rsyncable -9v .new-uploaders.gz + gzip -9v .new-uploaders.gz mv -f .new-uploaders.gz Uploaders.gz else rm -f .new-uploaders @@ -340,7 +347,7 @@ function mkfilesindices() { cd $base/ftp find ./dists -maxdepth 1 \! -type d find ./dists \! -type d | grep "/source/" - ) | sort -u | gzip --rsyncable -9 > source.list.gz + ) | sort -u | gzip -9 > source.list.gz log "Generating arch lists" @@ -352,7 +359,7 @@ function mkfilesindices() { 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 --rsyncable -9 > arch-$a.list.gz + ) | sort -u | gzip -9 > arch-$a.list.gz done log "Generating suite lists" @@ -375,7 +382,7 @@ function mkfilesindices() { done ) suite_list $id | tr -d ' ' | sed 's,^/srv/ftp-master.debian.org/ftp,.,' - ) | sort -u | gzip --rsyncable -9 > suite-${suite}.list.gz + ) | sort -u | gzip -9 > suite-${suite}.list.gz done log "Finding everything on the ftp site to generate sundries" @@ -394,12 +401,12 @@ function mkfilesindices() { done (cd $base/ftp/ - for dist in sid squeeze; do - find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip --rsyncable -9 > $base/ftp/indices/files/components/translation-$dist.list.gz + for dist in sid wheezy; do + find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz done ) - (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-squeeze.list.gz) | + (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-wheezy.list.gz) | sort -u | poolfirst > ../typical.files rm -f $ARCHLIST @@ -414,7 +421,7 @@ function mkchecksums() { cd "$ftpdir" ${bindir}/dsync-flist -q generate $dsynclist --exclude $dsynclist --md5 - ${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n --rsyncable > ${md5list}.gz + ${bindir}/dsync-flist -q md5sums $dsynclist | gzip -9n > ${md5list}.gz ${bindir}/dsync-flist -q link-dups $dsynclist || true } @@ -484,8 +491,8 @@ function i18n2() { STAMP=$(date "+%Y%m%d%H%M") mkdir -p ${scriptdir}/i18n/${STAMP} cd ${scriptdir}/i18n/${STAMP} - dak control-suite -l stable > lenny - dak control-suite -l testing > squeeze + dak control-suite -l stable > squeeze + dak control-suite -l testing > wheezy dak control-suite -l unstable > sid echo "${STAMP}" > timestamp gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp