X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=a2e2fe7355dd5073836b910f5569f3d88af85229;hb=f92f5bd318e254805016bb9b92ee683f912d3cf2;hp=98226f350eb9d1c07901c1343f69307ef1fe3275;hpb=3c514edd02797f51246e8669eda5a0f17bbb6ea1;p=dak.git diff --git a/config/debian/common b/config/debian/common index 98226f35..a2e2fe73 100644 --- a/config/debian/common +++ b/config/debian/common @@ -35,7 +35,7 @@ function wbtrigger() { function make_buildd_dir () { dak manage-build-queues -a dak generate-packages-sources2 -a build-queues - dak generate-releases -a build-queues + dak generate-releases -a build-queues >/dev/null for suite in unstable experimental; do rm -rf "$incoming/dists/$suite/buildd" @@ -51,9 +51,9 @@ function make_buildd_dir () { if [ "${suite}x" = "projectx" ]; then continue; fi cd ${incoming}/dists/${suite}/buildd - dpkg-scanpackages . $overridedir/override.sid.all3 >Packages + apt-ftparchive packages . $overridedir/override.sid.all3 >Packages gzip -9c --rsyncable Packages.gz - dpkg-scansources . $overridedir/override.sid.all3.src >Sources + apt-ftparchive sources . $overridedir/override.sid.all3.src >Sources gzip -9c --rsyncable Sources.gz rm -f buildd/Release @@ -68,6 +68,8 @@ function make_buildd_dir () { mv Release Release.gpg buildd/ done + STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} + for dist in $(ls -1 ${incoming}/dists/); do # Skip project trace directory if [ "${dist}x" = "projectx" ]; then continue; fi @@ -89,9 +91,13 @@ function punew_do() { dak generate-packages-sources2 -s "${queue}" - local exportdir="${queuedir}/${qdir}/export" - rm -rf "${exportdir}" + STAMP=${STAMP:-$(date "+%Y%m%d%H%M")} + + local exportdir="${queuedir}${qdir}/tree/${STAMP}" + local targetdir="${queuedir}${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 } # These versions used in dinstall @@ -122,6 +128,7 @@ function do_unchecked () { echo "$timestamp": ${changes:-"Nothing to do"} >> $report dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report + dak process-commands -d "$unchecked" >> $report } # process NEW policy queue