X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fdinstall.functions;h=f1e49e4244cc844e75c6b4971fa150d4845a8ecd;hb=f3cbed6812df92b24987c519ecfdd00787d7e2a4;hp=6857a43698d2bb0bf93f0704fd8f96eea487f924;hpb=1c20056f57077ece45513e0f0d404728f8deeb54;p=dak.git diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions index 6857a436..f1e49e42 100644 --- a/config/debian/dinstall.functions +++ b/config/debian/dinstall.functions @@ -142,30 +142,30 @@ function filelist() { function fingerprints() { log "Not updating fingerprints - scripts needs checking" -# log "Updating fingerprints" -# dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg - -# OUTFILE=$(mktemp) -# dak import-keyring --generate-users "%s" /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}" - -# if [ -s "${OUTFILE}" ]; then -# /usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org < -#To: -#Subject: Debian Maintainers Keyring changes -#Content-Type: text/plain; charset=utf-8 -#MIME-Version: 1.0 -# -#The following changes to the debian-maintainers keyring have just been activated: -# -#$(cat $OUTFILE) -# -#Debian distribution maintenance software, -#on behalf of the Keyring maintainers -# -#EOF -# fi -# rm -f "$OUTFILE" + log "Updating fingerprints" + dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg + + OUTFILE=$(mktemp) + dak import-keyring --generate-users "%s" /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}" + + if [ -s "${OUTFILE}" ]; then + /usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org < +To: +Subject: Debian Maintainers Keyring changes +Content-Type: text/plain; charset=utf-8 +MIME-Version: 1.0 + +The following changes to the debian-maintainers keyring have just been activated: + +$(cat $OUTFILE) + +Debian distribution maintenance software, +on behalf of the Keyring maintainers + +EOF + fi + rm -f "$OUTFILE" } function overrides() { @@ -202,7 +202,8 @@ function release() { function dakcleanup() { log "Cleanup old packages/files" - dak clean-suites -m 10000 + # TODO: Fix up clean-suites + #dak clean-suites -m 10000 dak clean-queues }