Remove GPGKeyring - it's no longer used

[dak.git] / config / debian-security / cron.buildd

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 7bd0e7e602333d474e61b54095265ba726d7eae5..043d5481d1155401fa8bb1828cba27ffe8eb2c29 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -25,8 +25,9 @@ apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
 cd  ${base}/buildd
 for dist in $DISTS; do
     rm -f $dist/Release*
-    archs=$(dak admin s-a list-arch $dist | tr '\n' ' ')
-    apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $dist security" -o APT::FTPArchive::Release::Architectures="${archs}" release $dist > Release
+    darchs=$(dak admin s-a list-arch $dist | tr '\n' ' ')
+    codename=$(dak admin s show ${dist} | grep ^Codename | awk '{print $2}')
+    apt-ftparchive -qq -o APT::FTPArchive::Release::Codename="${codename}" -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $dist security" -o APT::FTPArchive::Release::Architectures="${darchs}" release $dist > Release
     gpg --secret-keyring ${base}/s3kr1t/dot-gnupg/secring.gpg --keyring ${base}/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o Release.gpg Release
     mv Release* $dist/.
 done
@@ -68,6 +69,21 @@ if [ ! -z "$dists" ]; then
     done
     trap 'kill -TERM $SSH_PID' 0
     for d in $dists; do
-        ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
+        case $d in
+            oldstable)
+                send=lenny
+                ;;
+            stable)
+                send=squeeze
+                ;;
+            testing)
+                send=testing
+                ;;
+            *)
+                send=unknown
+                ;;
+        esac
+
+        ssh wbadm@buildd -S $SSH_SOCKET trigger.security $send
     done
 fi