X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fbackports%2Fcommon;h=5c488fffb614cb253e75c32cbeacc6da4ece8a53;hb=edf9c774f7d5b0148a30fd63bf1fa6bddf68d478;hp=dd60e13ed09f0e6453530cf0324033bbdca7fb64;hpb=84054b05c7ef40c453dd07dd8a4e0b61ae3bdb21;p=dak.git diff --git a/config/backports/common b/config/backports/common index dd60e13e..5c488fff 100644 --- a/config/backports/common +++ b/config/backports/common @@ -37,15 +37,6 @@ function wbtrigger() { # used by cron.dinstall *and* cron.unchecked. function make_buildd_dir () { dak manage-build-queues -a - - for dist in $(ls -1 ${incoming}/dists/); do - cd ${incoming}/dists/${dist} - mkdir -p tree/${STAMP} - cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/ - ln -sfT tree/${STAMP} ${incoming}/dists/${dist}/current - find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf - done - } # Do the unchecked processing, in case we have files. @@ -79,9 +70,10 @@ function sync_debbugs () { echo "--" >> $report timestamp=$(date "+%Y-%m-%d-%H:%M") mkdir -p $queuedir/bts_version_track_archive/${timestamp} - rsync -aq $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp} + rsync -aq --remove-source-files $queuedir/bts_version_track/ $queuedir/bts_version_track_archive/${timestamp} rmdir --ignore-fail-on-non-empty $queuedir/bts_version_track_archive/${timestamp} # remove if empty. -# rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true + return 0 + rsync -aq -e "ssh -o Batchmode=yes -o ConnectTimeout=30 -o SetupTimeout=30" --remove-source-files $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/ 2>/dev/null && touch $lockdir/synced_bts_version || true NOW=$(date +%s) TSTAMP=$(stat -c %Y $lockdir/synced_bts_version) DIFF=$(( NOW - TSTAMP )) @@ -89,3 +81,20 @@ function sync_debbugs () { log "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)" fi } + +function reports() { + # Send a report on NEW/BYHAND packages + log "Nagging ftpteam about NEW/BYHAND packages" + dak queue-report | mail -e -s "NEW and BYHAND on $(date +%D)" team@backports.debian.org + # and one on crufty packages + log "Sending information about crufty packages" + dak cruft-report -R > $webdir/cruft-report-daily.txt +# dak cruft-report -R -s experimental >> $webdir/cruft-report-daily.txt + cat $webdir/cruft-report-daily.txt | mail -e -s "Debian archive cruft report for $(date +%D)" team@backports.debian.org +} + +function pg_timestamp() { + tsname=${1:-"unknown"} + log "Saving postgres transaction id for ${tsname}" + psql -tAc 'select txid_current();' > $base/backup/txid_${tsname}_$(date +%Y.%m.%d-%H:%M:%S) +}