Skip to content

Commit

Permalink
Make sequoia signing work with sequoia-sq >= 0.38
Browse files Browse the repository at this point in the history
sequoia-sq 0.38 removed all short options, at least temporarily:
https://gitlab.com/sequoia-pgp/sequoia-sq/-/commit/f7ce1fa2a172ae02171a3421bebf2a4aa3cfb8a5

As that version got supplied to Fedora 40 as an update, we started getting
intermittent failures where every other CI run failed due to it having
the newer version that didn't accept the -o usage we just added in
d99186f. What a timing.

There's no reason why we couldn't just use the long ones though, it's more
readable that way anyhow. Shrug and move on.

Fixes: rpm-software-management#3317
  • Loading branch information
pmatilai committed Sep 20, 2024
1 parent d05c4fc commit 25c198e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion macros.in
Original file line number Diff line number Diff line change
Expand Up @@ -631,7 +631,7 @@ Supplements: (%{name} = %{version}-%{release} and langpacks-%{1})\
%{__sq} sign \
%{?_openpgp_sign_id:--signer-key %{_openpgp_sign_id}} \
%{?_sq_sign_cmd_extra_args} \
--detached -o %{shescape:%{?__signature_filename}} \
--detached --output %{shescape:%{?__signature_filename}} \
%{?__plaintext_filename:-- %{shescape:%{__plaintext_filename}}}

%__openpgp_sign_path %{expand:%{__%{_openpgp_sign}}}
Expand Down

0 comments on commit 25c198e

Please sign in to comment.