Merge remote-tracking branch 'ansgar/p-s-from-db' into merge

* ansgar/p-s-from-db:
  daklib/changes.py: add logger parameter
  generate-packages-sources2: Add external overrides
  Add external-overrides.

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/dak/process_new.py b/dak/process_new.py
index dfdb2e97104da628b10617a286c08e64bac90e94..e3716557cbf132c14df14b93b89b49fdcdee7dfd 100755 (executable)
--- a/dak/process_new.py
+++ b/dak/process_new.py
@@ -688,6 +688,7 @@ def do_pkg(changes_full_path, session):
         u.Subst["__BCC__"] = bcc
 
     files = u.pkg.files
+    u.check_distributions()
     for deb_filename, f in files.items():
         if deb_filename.endswith(".udeb") or deb_filename.endswith(".deb"):
             u.binary_file_checks(deb_filename, session)

diff --git a/scripts/debian/buildd-remove-keys b/scripts/debian/buildd-remove-keys
index 3591785d6c028769b169a9b22f1f81b3b1f5e2a9..b9b2ecfea7907160bf644cfefb58800dd9fdcdcc 100755 (executable)
--- a/scripts/debian/buildd-remove-keys
+++ b/scripts/debian/buildd-remove-keys
@@ -190,7 +190,9 @@ for file in ${KEYS}; do
         # So put it into the removed keyring
         gpg ${DEFGPGOPT} --keyring "${ARCHKEYRING}" --export ${KEYID} | gpg ${DEFGPGOPT} --keyring "${REMOVED}" --import 2>/dev/null
         if gpg ${DEFGPGOPT} --keyring "${ARCHKEYRING}" --yes --delete-keys ${KEYID}; then
-            log "Removed key ${KEYID}, reason: ${COMMENT}"
+            KEYSUBMITTER=$(cat "${GPGSTATUS}"|grep GOODSIG)
+            KEYSUBMITTER=${KEYSUBMITTER##*GOODSIG}
+            log "${KEYSUBMITTER} removed key ${KEYID} for ${ARCH} buildd ${BUILDD}, reason: ${COMMENT}"
             mv "${INCOMING}/${file}" "${base}/${ARCH}"
             continue
         fi