X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcron.unchecked;h=41b664016126c642d12d7bb159d038e9f99f5516;hb=be43b7027584f24eb1faa6275553d96f91e4e6c7;hp=f17331df70a1bf032795b33486f007da67791b56;hpb=61d006638851764d7481f459cc7009eef2be2636;p=dak.git

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index f17331df..41b66401 100755
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -35,7 +35,14 @@ if lockfile -r3 $LOCKFILE; then
 	echo "--" >> $report
 
 	# sync with debbugs
-	rsync -aq --remove-source-files  $queuedir/bts_version_track/ bugs-sync:/org/bugs.debian.org/versions/queue/ftp-master/
+    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)
+	DIFF=$(( NOW - TSTAMP ))
+	if [ $DIFF -ge 259200 ]; then
+		echo "Kids, you tried your best and you failed miserably. The lesson is, never try. (Homer Simpson)"
+	fi
 
 	if lockfile -r3 $NOTICE; then
 	    LOCKDAILY="YES"
@@ -52,10 +59,11 @@ if lockfile -r3 $LOCKFILE; then
 	    cd $configdir
 	    apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
 
-	    cd  ${incoming}/buildd
-	    rm -f 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 . > Release
+	    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 
+		mv Release* buildd/.
 
 	    cd ${incoming}
 	    mkdir -p tree/${STAMP}