1 |
Use openpgp-verify-detached when app-portage/gemato-20.0 is installed. |
2 |
This lets us test the new code paths on ~arch with minimal risk |
3 |
of breakage on stable. |
4 |
|
5 |
Signed-off-by: Michał Górny <mgorny@g.o> |
6 |
--- |
7 |
eclass/verify-sig.eclass | 13 ++++++++++--- |
8 |
1 file changed, 10 insertions(+), 3 deletions(-) |
9 |
|
10 |
This is roughly the same patch that I've sent before, except that now |
11 |
it features a has_version condition to restrict the changes to ~arch |
12 |
gemato version. |
13 |
|
14 |
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass |
15 |
index 91433bf53453..f67a3b10a0bf 100644 |
16 |
--- a/eclass/verify-sig.eclass |
17 |
+++ b/eclass/verify-sig.eclass |
18 |
@@ -144,9 +144,16 @@ verify-sig_verify_detached() { |
19 |
# gpg can't handle very long TMPDIR |
20 |
# https://bugs.gentoo.org/854492 |
21 |
local -x TMPDIR=/tmp |
22 |
- gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ |
23 |
- gpg --verify "${sig}" "${file}" || |
24 |
- die "PGP signature verification failed" |
25 |
+ if has_version -b ">=app-portage/gemato-20"; then |
26 |
+ gemato openpgp-verify-detached -K "${key}" \ |
27 |
+ "${extra_args[@]}" \ |
28 |
+ "${sig}" "${file}" || |
29 |
+ die "PGP signature verification failed" |
30 |
+ else |
31 |
+ gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \ |
32 |
+ gpg --verify "${sig}" "${file}" || |
33 |
+ die "PGP signature verification failed" |
34 |
+ fi |
35 |
;; |
36 |
signify) |
37 |
signify -V -p "${key}" -m "${file}" -x "${sig}" || |
38 |
-- |
39 |
2.39.2 |