HCoop / jackhill / guix / guix.git / blame
| Commit | Line | Data |
|---|---|---|
| 6bc85e79 AE |
1 | See https://github.com/jaymzh/pius/pull/96 |
| 2 | ||
| 3 | commit 4dba0bf75ab351969622f7b9c38484657411a528 | |
| 4 | Author: Martin Kletzander <nert.pinx+github@gmail.com> | |
| 5 | Date: Thu May 17 17:55:27 2018 +0200 | |
| 6 | ||
| 7 | Don't fail on ENCRYPTION_COMPLIANCE_MODE line from too new GnuPG (#96) | |
| 8 | ||
| 9 | GnuPG started printing information about encryption compliance in [commit | |
| 10 | f31dc2540acf](https://dev.gnupg.org/rGf31dc2540acf7cd7f09fd94658e815822222bfcb) | |
| 11 | and since then signing with pius fails. | |
| 12 | ||
| 13 | Closes #95 | |
| 14 | ||
| 15 | Signed-off-by: Martin Kletzander <nert.pinx@gmail.com> | |
| 16 | ||
| 17 | diff --git a/libpius/signer.py b/libpius/signer.py | |
| 18 | index 3c7262f..13013bb 100644 | |
| 19 | --- a/libpius/signer.py | |
| 20 | +++ b/libpius/signer.py | |
| 21 | @@ -45,6 +45,7 @@ class PiusSigner(object): | |
| 22 | GPG_PINENTRY_LAUNCHED = '[GNUPG:] PINENTRY_LAUNCHED' | |
| 23 | GPG_KEY_CONSIDERED = '[GNUPG:] KEY_CONSIDERED' | |
| 24 | GPG_WARN_VERSION = '[GNUPG:] WARNING server_version_mismatch' | |
| 25 | + GPG_ENC_COMPLIANT_MODE = '[GNUPG:] ENCRYPTION_COMPLIANCE_MODE' | |
| 26 | ||
| 27 | def __init__(self, signer, force_signer, mode, keyring, gpg_path, tmpdir, | |
| 28 | outdir, encrypt_outfiles, mail, mailer, verbose, sort_keyring, | |
| 29 | @@ -431,6 +432,9 @@ class PiusSigner(object): | |
| 30 | if PiusSigner.GPG_ENC_BEG in line: | |
| 31 | debug('Got GPG_ENC_BEG') | |
| 32 | continue | |
| 33 | + elif PiusSigner.GPG_ENC_COMPLIANT_MODE in line: | |
| 34 | + debug('Got ENCRYPTION_COMPLIANCE_MODE') | |
| 35 | + continue | |
| 36 | elif PiusSigner.GPG_ENC_END in line: | |
| 37 | debug('Got GPG_ENC_END') | |
| 38 | break |