X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=scripts%2Fdebian%2Fbuildd-add-keys;h=2100f590c6a9000e708983eb08ffea60c8a091af;hb=8cc3abc9bfb1145151bacc92ba253df255401e6b;hp=f2e35fc645f725face453252c6926d4ff7460059;hpb=33bef72270a93446af34b264f445560d625fcfdb;p=dak.git

diff --git a/scripts/debian/buildd-add-keys b/scripts/debian/buildd-add-keys
index f2e35fc6..2100f590 100755
--- a/scripts/debian/buildd-add-keys
+++ b/scripts/debian/buildd-add-keys
@@ -43,8 +43,7 @@ function cleanup() {
     trap - ERR EXIT TERM HUP INT QUIT
 
     for TEMPFILE in GPGSTATUS GPGLOGS GPGOUTF TEMPKEYDATA; do
-        TFILE=${TEMPFILE:=$TEMPFILE}
-        DELF=${!TFILE:-""}
+        DELF=${!TEMPFILE:-""}
         if [ -n "${DELF}" ] && [ -f "${DELF}" ]; then
             rm -f "${DELF}"
         fi
@@ -273,7 +272,7 @@ for file in ${KEYS}; do
     # Right. At this point everything should be in order, which means we should put the key into
     # the keyring
     KEYSUBMITTER=$(cat "${GPGSTATUS}"|grep GOODSIG)
-    KEYSUBMITTER=${KEYSUBMITTER##*]}
+    KEYSUBMITTER=${KEYSUBMITTER##*GOODSIG}
     log "${KEYSUBMITTER} added key ${KEYID} for ${ARCH} buildd ${BUILDD}, expire ${KEYEXPIRE}"
     gpg ${DEFGPGOPT} --status-fd 4 --logger-fd 5 --keyring "${ARCHKEYRING}" --import "${GPGOUTF}" 2>/dev/null