diff options
| author |   Michał Górny <mgorny@gentoo.org> | 2023-01-23 09:22:12 +0100 |
|---|---|---|
| committer | Michał Górny <mgorny@gentoo.org> | 2023-03-10 20:18:56 +0100 |
| commit | 519f14fe6f74814196996da2d45c077003144db0 (patch) | |
| tree | b475ddaf9fac36890ecc5d60b94f20bbb22c4a7a | |
| parent | dev-util/cvise: Keyword 2.7.0 ppc64, #900701 (diff) | |
| download | gentoo-519f14fe6f74814196996da2d45c077003144db0.tar.gz gentoo-519f14fe6f74814196996da2d45c077003144db0.tar.bz2 gentoo-519f14fe6f74814196996da2d45c077003144db0.zip | |
verify-sig.eclass: Use gemato openpgp-verify-detached w/ 20.0+
Use openpgp-verify-detached when app-portage/gemato-20.0 is installed.
This lets us test the new code paths on ~arch with minimal risk
of breakage on stable.
Signed-off-by: Michał Górny <mgorny@gentoo.org>
| -rw-r--r-- | eclass/verify-sig.eclass | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass index 91433bf53453..f67a3b10a0bf 100644 --- a/eclass/verify-sig.eclass +++ b/eclass/verify-sig.eclass @@ -144,9 +144,16 @@ verify-sig_verify_detached() { # gpg can't handle very long TMPDIR # https://bugs.gentoo.org/854492 local -x TMPDIR=/tmp - gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ - gpg --verify "${sig}" "${file}" || - die "PGP signature verification failed" + if has_version ">=app-portage/gemato-20"; then + gemato openpgp-verify-detached -K "${key}" \ + "${extra_args[@]}" \ + "${sig}" "${file}" || + die "PGP signature verification failed" + else + gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ + gpg --verify "${sig}" "${file}" || + die "PGP signature verification failed" + fi ;; signify) signify -V -p "${key}" -m "${file}" -x "${sig}" || |