X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=886da457022bdea76307f204810a02a8ccb0e331;hb=d45b6f2ab1c178c6a889173ca98a5f1ca640ff72;hp=4469037a71040872d6225fee998694adebda356b;hpb=3b9e191e8737c5b866213b725a70aaf9c1e0e993;p=dak.git diff --git a/config/debian/common b/config/debian/common index 4469037a..886da457 100644 --- a/config/debian/common +++ b/config/debian/common @@ -105,11 +105,11 @@ function punew_do() { STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} - local exportdir="${queuedir}${qdir}/tree/${STAMP}" - local targetdir="${queuedir}${qdir}/export" + local exportdir="${qdir}/tree/${STAMP}" + local targetdir="${qdir}/export" dak export -q "${queue}" -d "${exportdir}" --all ln -sfT ${exportdir} ${targetdir} - find ${queuedir}${qdir}/tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf + find "${qdir}/tree" -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf } # These versions used in dinstall @@ -118,7 +118,7 @@ function punew() { log "Doing automated p-u-new processing" fi cd "${queuedir}/p-u-new" - punew_do "$1" "p-u-new" "debian-release@lists.debian.org" + punew_do "$1" "${queuedir}/p-u-new" "debian-release@lists.debian.org" } function opunew() { @@ -126,7 +126,7 @@ function opunew() { log "Doing automated o-p-u-new processing" fi cd "${queuedir}/o-p-u-new" - punew_do "$1" "o-p-u-new" "debian-release@lists.debian.org" + punew_do "$1" "${queuedir}/o-p-u-new" "debian-release@lists.debian.org" } function backports_policy() { @@ -195,6 +195,7 @@ function reports() { # Send a report on NEW/BYHAND packages log "Nagging ftpteam about NEW/BYHAND packages" dak queue-report | mail -a "X-Debian: DAK" -e -s "NEW and BYHAND on $(date +%D)" ftpmaster@ftp-master.debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org + dak queue-report -d backports-new,backports-policy | mail -a "X-Debian: DAK" -e -s "NEW and POLICY on $(date +%D)" backports-team@debian.org -- -F "Debian FTP Masters" -f ftpmaster@ftp-master.debian.org # and one on crufty packages log "Sending information about crufty packages" dak cruft-report -R > $webdir/cruft-report-daily.txt