cron

[dak.git] / config / debian / common

diff --git a/config/debian/common b/config/debian/common
index 090f2ab7376eaa9186edf5bc7c69ed3a6969f4f6..c79ad810b3cc12a77f673e5e3e040e4eaf5133ab 100644 (file)
--- a/config/debian/common
+++ b/config/debian/common
@@ -33,7 +33,7 @@ function make_buildd_dir () {
        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 6070D3A1 --detach-sign -o Release.gpg 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}
@@ -45,23 +45,23 @@ function make_buildd_dir () {
 
 # 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}"
-                exit 2
-            fi
-        done
-        mv --target-directory="${accepted}"  "${file}" "${file%%.changes}.dak"
-    done
+    return
+    # 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
 }
 
 # Do the unchecked processing, in case we have files.
@@ -71,14 +71,15 @@ function do_unchecked () {
     changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
     report=$queuedir/REPORT
     timestamp=$(date "+%Y-%m-%d %H:%M")
+    UNCHECKED_WITHOUT_LOCK=${UNCHECKED_WITHOUT_LOCK:-""}
 
-    echo "$timestamp": "$changes"  >> $report
-    dak process-unchecked -a -d "$unchecked" >> $report
-    echo "--" >> $report
+    echo "$timestamp": ${changes:-"Nothing to do"}  >> $report
+    dak process-upload -a ${UNCHECKED_WITHOUT_LOCK} -d "$unchecked" >> $report
 }
 
 function sync_debbugs () {
     # sync with debbugs
+    echo "--" >> $report
     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)