honour No-Action and say what's going on

[dak.git] / config / debian / dinstall.functions

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index c0ce58e05c37a5b6571df1d197292c3d7735f916..9e93182750a89345a0095599470404065ee69f31 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -134,31 +134,38 @@ function msfl() {
     dak make-suite-file-list
 }
 
-function fingerprints() {
-    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 <<EOF
-From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>
-To: <debian-project@lists.debian.org>
-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
+function filelist() {
+    log "Generating file lists for apt-ftparchive"
+    dak generate-filelist
+}
 
-EOF
-    fi
-    rm -f "$OUTFILE"
+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 <<EOF
+#From: Debian FTP Masters <ftpmaster@ftp-master.debian.org>
+#To: <debian-project@lists.debian.org>
+#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() {
@@ -195,19 +202,11 @@ 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
 }
 
-function buildd() {
-    # Needs to be rebuilt, as files have moved.  Due to unaccepts, we need to
-    # update this before wanna-build is updated.
-    log "Regenerating wanna-build/buildd information"
-    psql projectb -A -t -q -c "SELECT build_queue.path || '/' || build_queue_files.filename FROM build_queue_files LEFT JOIN build_queue ON (build_queue.id =build_queue_files.build_queue_id) WHERE queue_name = 'buildd' AND filename ~ 'd(sc|eb)$'"  > $dbdir/dists/unstable_accepted.list
-    symlinks -d /srv/incoming.debian.org/buildd > /dev/null
-    apt-ftparchive generate apt.conf.buildd
-}
-
 function buildd_dir() {
     # Rebuilt the buildd dir to avoid long times of 403
     log "Regenerating the buildd incoming dir"