Joerg Jaspert pushed to branch master at Debian FTP Team / dak
Commits:
-
c54a2153
by Joerg Jaspert at 2019-01-11T09:18:27Z
2 changed files:
Changes:
| ... | ... | @@ -135,9 +135,12 @@ for file in ${KEYS}; do |
| 135 | 135 |
if [ -f "${ARCHADMINS}/${ARCH}.gpg" ]; then
|
| 136 | 136 |
KEYRINGS="${KEYRINGS} --keyring ${ARCHADMINS}/${ARCH}.gpg"
|
| 137 | 137 |
fi
|
| 138 |
+ set +e
|
|
| 139 |
+ gpg ${DEFGPGOPT} ${KEYRINGS} --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"
|
|
| 140 |
+ ret=$?
|
|
| 141 |
+ set -e
|
|
| 138 | 142 |
# So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
|
| 139 |
- if ! gpg ${DEFGPGOPT} ${KEYRINGS} --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
|
|
| 140 |
- ret=$?
|
|
| 143 |
+ if [[ ${ret} -ne 0 ]]; then
|
|
| 141 | 144 |
log "gpg returned with ${ret}, not adding key from file ${file}"
|
| 142 | 145 |
DATE=$(date -Is)
|
| 143 | 146 |
mv "${INCOMING}/${file}" "${ERRORS}/gpgerror.${file}.${DATE}"
|
| ... | ... | @@ -132,8 +132,11 @@ for file in ${KEYS}; do |
| 132 | 132 |
exec 5> "${GPGLOGS}"
|
| 133 | 133 |
|
| 134 | 134 |
# So lets run gpg, status/logger into the two files, to "decrypt" the keyfile
|
| 135 |
- if ! gpg ${DEFGPGOPT} --keyring "${ADMINS}" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"; then
|
|
| 136 |
- ret=$?
|
|
| 135 |
+ set +e
|
|
| 136 |
+ gpg ${DEFGPGOPT} --keyring "${ADMINS}" --status-fd 4 --logger-fd 5 --decrypt "${INCOMING}/${file}" > "${GPGOUTF}"
|
|
| 137 |
+ ret=$?
|
|
| 138 |
+ set -e
|
|
| 139 |
+ if [[ ${ret} -ne 0 ]]; then
|
|
| 137 | 140 |
log "gpg returned with ${ret}, not removing key using ${file}"
|
| 138 | 141 |
DATE=$(date -Is)
|
| 139 | 142 |
mv "${INCOMING}/${file}" "${ERRORS}/gpgerror.${file}.${DATE}"
|