From: Joerg Jaspert Date: Sat, 3 Dec 2011 16:07:32 +0000 (+0100) Subject: import dm keyring on bpo X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2c0e11e248e13ad7b220b2bdb8020827f79a7e84;p=dak import dm keyring on bpo Signed-off-by: Joerg Jaspert --- diff --git a/config/backports/cron.dinstall b/config/backports/cron.dinstall index 33d4bc70..c10e3c04 100755 --- a/config/backports/cron.dinstall +++ b/config/backports/cron.dinstall @@ -231,13 +231,13 @@ GO=( ) stage $GO -# GO=( -# FUNC="fingerprints" -# TIME="import-keyring" -# ARGS="" -# ERR="false" -# ) -# stage $GO +GO=( + FUNC="fingerprints" + TIME="import-keyring" + ARGS="" + ERR="false" +) +stage $GO GO=( FUNC="overrides" diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions index d02f9c37..73b801e4 100644 --- a/config/backports/dinstall.functions +++ b/config/backports/dinstall.functions @@ -121,7 +121,7 @@ function filelist() { function fingerprints() { log "Updating fingerprints" - dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg + dak import-keyring -L /srv/backports-master.debian.org/keyrings/keyring.gpg OUTFILE=$(mktemp) dak import-keyring --generate-users "%s" /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}" @@ -129,7 +129,7 @@ function fingerprints() { if [ -s "${OUTFILE}" ]; then /usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org < -To: +To: Subject: Debian Maintainers Keyring changes Content-Type: text/plain; charset=utf-8 X-Debian: DAK