X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config%2Fdebian%2Fcommon;h=4a0d6cb997475e289117e1c2a09e28159cd436b1;hb=fa61e804d27f286dd5ad60f9212495a5972916f0;hp=599f8dc55a02c517cfc3e39852a253b9c1161064;hpb=0dfcad8b764f61ff359a426bc9f7be966e5f6d9f;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 599f8dc5..4a0d6cb9 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -27,40 +27,13 @@ function debug () {
 
 # used by cron.dinstall *and* cron.unchecked.
 function make_buildd_dir () {
-	cd $configdir
-	apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
+    dak manage-build-queues -v buildd
 
-	cd  ${incoming}
-	rm -f buildd/Release*
-	apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release buildd > Release
-	gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o Release.gpg Release
-	mv Release* buildd/.
-
-	cd ${incoming}
-	mkdir -p tree/${STAMP}
-	cp -al ${incoming}/buildd/. tree/${STAMP}/
-	ln -sfT tree/${STAMP} ${incoming}/builddweb
-	find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
-}
-
-# move accepted NEW packages from stagedir into queue/accepted
-function acceptnew () {
-    cd $newstage
-    for file in $(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs); do
-        sed '1,/Files:/d' "${file}" | sed '/BEGIN PGP SIGNATURE/,$d' \
-            | while read notused1 notused2 notused3 notused4 NAME; do
-            if [ -z "${NAME}" ]; then
-                # Sometimes there is a newline after the Files:, ignore it
-                continue
-            fi
-            if [ -f "${NAME}" ]; then
-                mv --target-directory="${accepted}" "${NAME}"
-            else
-                log_error "Error, couldn't find file ${NAME} to move to ${accepted}"
-            fi
-        done
-        mv --target-directory="${accepted}"  "${file}" "${file%%.changes}.dak"
-    done
+    cd ${incoming}
+    mkdir -p tree/${STAMP}
+    cp -al ${incoming}/buildd/. tree/${STAMP}/
+    ln -sfT tree/${STAMP} ${incoming}/builddweb
+    find ./tree -mindepth 1 -maxdepth 1 -not -name "${STAMP}" -type d -print0 | xargs --no-run-if-empty -0 rm -rf
 }
 
 # Do the unchecked processing, in case we have files.
@@ -73,7 +46,7 @@ function do_unchecked () {
     UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""}
 
     echo "$timestamp": ${changes:-"Nothing to do"}  >> $report
-    dak process-unchecked -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
+    dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
 }
 
 function sync_debbugs () {