[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[Git][ftp-team/dak][deploy] 3 commits: Don't let the if eat the return value away from us

Title: GitLab

Joerg Jaspert pushed to branch deploy at Debian FTP Team / dak

Commits:

3 changed files:

Changes:

  • config/debian/daily.functions
    ... ... @@ -63,7 +63,7 @@ function update-buildd-admin-keyring() {
    63 63 
         log "Updateing buildd admin keyring"
    64 64 
         . ${configdir}/buildd-keyrings.conf
    65 65 
         cd ${scriptdir}/builddkeyrings
    66 
    -    gpg --no-default-keyring --keyring /srv/keyring.debian.org/keyrings/debian-keyring.gpg --export "${buildd_admin_keys[@]}" |
    67 
    -        gpg --no-default-keyring --keyring ./adminkeys.gpg.new --import
    66 
    +    gpg --no-tty --no-default-keyring --keyring /srv/keyring.debian.org/keyrings/debian-keyring.gpg --export "${buildd_admin_keys[@]}" |
    67 
    +        gpg --no-tty --no-default-keyring --keyring ./adminkeys.gpg.new --import
    68 68 
         mv adminkeys.gpg.new adminkeys.gpg
    69 69 
     }

  • scripts/debian/buildd-add-keys
    ... ... @@ -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}"

  • scripts/debian/buildd-remove-keys
    ... ... @@ -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}"

    • —
    View it on GitLab.
    You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.

    Reply to: