X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=599f8dc55a02c517cfc3e39852a253b9c1161064;hb=6e852147a696f24471c44d4d58ca1c09b6cbb2a3;hp=090f2ab7376eaa9186edf5bc7c69ed3a6969f4f6;hpb=9e8a49aac094ee37db8abf38e46a42d7135437de;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index 090f2ab7..599f8dc5 100644
--- 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}
@@ -57,7 +57,6 @@ function acceptnew () {
                 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"
@@ -71,14 +70,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-unchecked -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)