Skip to content

Commit

Permalink
qvm-template: fix hardcoded '4.1' in default RPM keyring location
Browse files Browse the repository at this point in the history
$ qvm-template install 'qubes-template-fedora-39-minimal-0:4.2.0-202311171650.rpm'
error: /etc/qubes/repo-templates/keys/RPM-GPG-KEY-qubes-4.1-primary: import read failed(2).
ERROR: Command '['rpmkeys', '--dbpath=/tmp/tmp9rhce9__', '--import', '/etc/qubes/repo-templates/keys/RPM-GPG-KEY-qubes-4.1-primary']' returned non-zero exit status 1.
  • Loading branch information
rustybird committed Nov 17, 2023
1 parent d94c1d9 commit f55fd05
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion qubesadmin/tools/qvm_template.py
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,8 @@ def parser_add_command(cmd, help_str):
help=('Specify files containing DNF repository configuration.'
' Can be used more than once.'))
parser_main.add_argument('--keyring',
default='/etc/qubes/repo-templates/keys/RPM-GPG-KEY-qubes-4.1-primary',
default='/etc/qubes/repo-templates/keys/'
f'RPM-GPG-KEY-qubes-{qubes_release()}-primary',
help='Specify a file containing default RPM public key. '
'Individual repositories may point at repo-specific key '
'using \'gpgkey\' option')
Expand Down

0 comments on commit f55fd05

Please sign in to comment.