[dak/master] treat non-uploading DDs like DMs (Closes: #871671)
---
config/debian/dak.conf | 1 +
config/debian/dinstall.functions | 1 +
tools/debianqueued-0.9/config-upload | 1 +
tools/debianqueued-0.9/config-usper | 1 +
4 files changed, 4 insertions(+)
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7f9c7dc..956c830 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -291,6 +291,7 @@ Command::DM {
};
Keyrings {
"/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
+ "/srv/keyring.debian.org/keyrings/debian-nonupload.gpg";
};
};
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 2eed7f6..fbeaf72 100755
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -163,6 +163,7 @@ function autocruft() {
function fingerprints() {
log "Updating fingerprints"
dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-keyring.gpg
+ dak import-keyring -L /srv/keyring.debian.org/keyrings/debian-nonupload.gpg
OUTFILE=$( gettempfile )
dak import-keyring --generate-users "%s" /srv/keyring.debian.org/keyrings/debian-maintainers.gpg >"${OUTFILE}"
diff --git a/tools/debianqueued-0.9/config-upload b/tools/debianqueued-0.9/config-upload
index 4b16a7b..80bf38e 100644
--- a/tools/debianqueued-0.9/config-upload
+++ b/tools/debianqueued-0.9/config-upload
@@ -54,6 +54,7 @@ $statusdelay = 30;
# names of the keyring files
@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
"/srv/keyring.debian.org/keyrings/debian-maintainers.gpg",
+ "/srv/keyring.debian.org/keyrings/debian-nonupload.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-all-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm64-keyring.gpg",
diff --git a/tools/debianqueued-0.9/config-usper b/tools/debianqueued-0.9/config-usper
index 5839cd5..4d3e4f4 100644
--- a/tools/debianqueued-0.9/config-usper
+++ b/tools/debianqueued-0.9/config-usper
@@ -54,6 +54,7 @@ $statusdelay = 30;
# names of the keyring files
@keyrings = ( "/srv/keyring.debian.org/keyrings/debian-keyring.gpg",
"/srv/keyring.debian.org/keyrings/debian-maintainers.gpg",
+ "/srv/keyring.debian.org/keyrings/debian-nonupload.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-all-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-amd64-keyring.gpg",
"/srv/keyring.debian.org/keyrings/buildd-keyrings/buildd-arm64-keyring.gpg",
--
2.1.4
Reply to: