[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[dak/master] simplify wanna-build update by calling a trigger script



2008-12-18  Philipp Kern  <pkern@debian.org>

        * config/debian-security/cron.buildd: simplify wanna-build update
        by calling a trigger script on the wanna-build host
        * config/debian-security/cron.daily: no need to refresh
        packages-arch-specific anymore

Signed-off-by: Philipp Kern <pkern@debian.org>
---
 ChangeLog                          |    7 +++++++
 config/debian-security/cron.buildd |   14 +-------------
 config/debian-security/cron.daily  |    5 -----
 3 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f3f16af..ebdabf7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2008-12-18  Philipp Kern  <pkern@debian.org>
+
+	* config/debian-security/cron.buildd: simplify wanna-build update
+	by calling a trigger script on the wanna-build host
+	* config/debian-security/cron.daily: no need to refresh
+	packages-arch-specific anymore
+
 2008-12-16  Joerg Jaspert  <joerg@debian.org>
 
 	* config/debian/cron.dinstall: Run logs.py as last command before
diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index d38e093..c5bcbb0 100755
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -57,19 +57,7 @@ if [ ! -z "$dists" ]; then
 	done
 	trap 'kill -TERM $SSH_PID' 0
 	for d in $dists; do
-		archs=ARCHS_$d
-		ARCHS=${!archs}
-		cd /org/security.debian.org/buildd/$d
-		if [ "$d" != "oldstable" ]; then
-			# disabled for oldstable-security by ajt 2008-01-01
-			for a in $ARCHS; do
-				quinn-diff -a /org/security.debian.org/buildd/Packages-arch-specific -A $a 2>/dev/null | ssh wbadm@buildd -S $SSH_SOCKET wanna-build -d $d-security -b $a/build-db --merge-partial-quinn
-
-				ssh wbadm@buildd -S $SSH_SOCKET wanna-build -d $d-security -A $a -b $a/build-db --merge-packages < Packages
-			done
-		else
-			ssh buildd@bester.farm.ftbfs.de -i ~/.ssh/id_bester sleep 1
-		fi
+		ssh wbadm@buildd -S $SSH_SOCKET trigger.security $d
 	done
 fi
 
diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index 4e02e57..8d94978 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -60,11 +60,6 @@ done
 
 ################################################################################
 
-# Freshen Packages-Arch-Specific
-wget -qN http://buildd.debian.org/quinn-diff/Packages-arch-specific -O $base/buildd/Packages-arch-specific
-
-################################################################################
-
 cd $masterdir
 dak clean-queues
 dak clean-suites
-- 
1.5.6.5


Reply to: