parchlinux-mobile/parchbootstrap
1
0
Fork 0
forked from parchlinux-mobile/kupferbootstrap
Code Issues Pull requests Activity

distro/keyring: use vanilla pacman-key now that --gpgdir is merged

Browse source
This commit is contained in:
InsanePrawn 2024-04-01 17:57:12 +02:00
parent d2e0fad436
commit 3e957254f5
1 changed files with 2 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
distro/keyring.py
View file

@ -70,7 +70,7 @@ def init_keyring_gpg_dir(
exists = False exists = False
lazy = lazy and exists lazy = lazy and exists
if not lazy: if not lazy:
run_cmd([get_pacman_key_binary(), '--init', '--gpgdir', gpg_dir]) run_cmd(['pacman-key', '--init', '--gpgdir', gpg_dir])
results = {} results = {}
for name, val in keyring_dists.items(): for name, val in keyring_dists.items():
dist_dir, dist_changed = val dist_dir, dist_changed = val
@ -88,7 +88,7 @@ def import_dist_keyring(
dist_dir: str, dist_dir: str,
) -> CompletedProcess: ) -> CompletedProcess:
assert gpg_dir and dist_dir and config.runtime.script_source_dir assert gpg_dir and dist_dir and config.runtime.script_source_dir
r = run_cmd([get_pacman_key_binary(), '--populate-from', dist_dir, '--populate', '--gpgdir', gpg_dir]) r = run_cmd(['pacman-key', '--populate-from', dist_dir, '--populate', '--gpgdir', gpg_dir])
assert isinstance(r, CompletedProcess) assert isinstance(r, CompletedProcess)
return r return r
@ -191,7 +191,3 @@ def get_keyring_dist_path(base_dir: str, *name) -> str:
def get_keyring_gpg_path(base_dir: str) -> str: def get_keyring_gpg_path(base_dir: str) -> str:
return os.path.join(base_dir, KEYRING_GPG_DIR) return os.path.join(base_dir, KEYRING_GPG_DIR)
def get_pacman_key_binary() -> str:
return os.path.join(config.runtime.script_source_dir, 'bin', 'pacman-key-user')