[dak/master] Publish security archive on all changes
With "wheezy" being used for Debian LTS, the archive needs to be
published not only when policy queue uploads are accepted, but also
when direct uploads to "wheezy" arrive.
The same applies to uploads to "jessie-kfreebsd".
---
config/debian-security/cron.unchecked | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/config/debian-security/cron.unchecked b/config/debian-security/cron.unchecked
index 7e2bb29..d3403ca 100755
--- a/config/debian-security/cron.unchecked
+++ b/config/debian-security/cron.unchecked
@@ -18,6 +18,10 @@ doanything=false
dopolicy=false
LOCKFILE="$lockdir/unchecked.lock"
+last_changed() {
+ psql -qAtc "SELECT MAX(last_changed) FROM suite WHERE archive_id=(SELECT id FROM archive WHERE name='$1')"
+}
+
cleanup() {
rm -f "$LOCKFILE"
}
@@ -28,6 +32,8 @@ if ! lockfile -r8 "$LOCKFILE"; then
fi
trap cleanup EXIT
+old_last_changed=$(last_changed security)
+
cd $unchecked
changes=$(find . -maxdepth 1 -mindepth 1 -type f -name \*.changes | sed -e "s,./,," | xargs)
if [ -n "$changes" ]; then
@@ -82,7 +88,9 @@ dak generate-packages-sources2 -a build-queues
dak generate-releases -a build-queues >/dev/null
${scriptsdir}/update-buildd-archive ${base}/build-queues ${incoming}/debian-security-buildd
-if [ "x${dopolicy}x" = "xtruex" ]; then
+new_last_changed=$(last_changed security)
+
+if [[ "${old_last_changed}" != "${new_last_changed}" ]]; then
# We had something approved from a policy queue, push out new archive
dak dominate
cd $configdir
--
2.1.4
Reply to: