Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-03-13 09:36:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Show key selection for merge commit signing

Browse Source
This commit is contained in:
Janek Bevendorff 2025-03-11 18:26:05 +01:00
parent 75ce550c64
commit b1f20aec69
No known key found for this signature in database
GPG Key ID: 2CF41D2AA8438F99
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release-tool.py
View File

@ -425,8 +425,7 @@ class Merge(Command):
parser.add_argument('-b', '--release-branch', help='Release source branch (default: inferred from version).') parser.add_argument('-b', '--release-branch', help='Release source branch (default: inferred from version).')
parser.add_argument('-t', '--tag-name', help='Name of tag to create (default: same as version).') parser.add_argument('-t', '--tag-name', help='Name of tag to create (default: same as version).')
parser.add_argument('-l', '--no-latest', help='Don\'t advance "latest" tag.', action='store_true') parser.add_argument('-l', '--no-latest', help='Don\'t advance "latest" tag.', action='store_true')
parser.add_argument('-k', '--sign-key', default='BF5A669F2272CF4324C1FDA8CFB4C2166397D0D2', parser.add_argument('-k', '--sign-key', help='PGP key for signing release tags (default: ask).')
help='PGP key for signing merge commits (default: %(default)s).')
parser.add_argument('--no-sign', help='Don\'t sign release tags (for testing only!)', action='store_true') parser.add_argument('--no-sign', help='Don\'t sign release tags (for testing only!)', action='store_true')
parser.add_argument('-y', '--yes', help='Bypass confirmation prompts.', action='store_true') parser.add_argument('-y', '--yes', help='Bypass confirmation prompts.', action='store_true')
parser.add_argument('--skip-translations', help='Skip pulling translations from Transifex', action='store_true') parser.add_argument('--skip-translations', help='Skip pulling translations from Transifex', action='store_true')
@ -440,6 +439,8 @@ class Merge(Command):
major, minor, patch = _split_version(version) major, minor, patch = _split_version(version)
Check.perform_basic_checks(src_dir) Check.perform_basic_checks(src_dir)
Check.perform_version_checks(version, src_dir, release_branch) Check.perform_version_checks(version, src_dir, release_branch)
Check.check_gnupg()
sign_key = GPGSign.get_secret_key(sign_key)
# Update translations # Update translations
if not skip_translations: if not skip_translations:
@ -881,8 +882,8 @@ class GPGSign(Command):
parser.add_argument('file', help='Input file(s) to sign', nargs='+') parser.add_argument('file', help='Input file(s) to sign', nargs='+')
parser.add_argument('-k', '--gpg-key', help='GnuPG key for signing input files (default: ask).') parser.add_argument('-k', '--gpg-key', help='GnuPG key for signing input files (default: ask).')
# noinspection PyMethodMayBeStatic @staticmethod
def _get_secret_key(self, user_choice): def get_secret_key(user_choice):
keys = _run(['gpg', '--list-secret-keys', '--keyid-format=long'], cwd=None, text=True) keys = _run(['gpg', '--list-secret-keys', '--keyid-format=long'], cwd=None, text=True)
keys = re.findall(r'^sec#?\s+(.+?/[A-F0-9]+) .+?\n\s+(.+?)\nuid .+?] (.+?)\n', keys.stdout, re.MULTILINE) keys = re.findall(r'^sec#?\s+(.+?/[A-F0-9]+) .+?\n\s+(.+?)\nuid .+?] (.+?)\n', keys.stdout, re.MULTILINE)
if not keys: if not keys: