From b91e8b983cc47c5478f25b4b1fbdb50753f3686d Mon Sep 17 00:00:00 2001 From: Levente Polyak Date: Wed, 20 Oct 2021 01:41:04 +0200 Subject: [PATCH] feature(keyringctl): move main/packager folders to isolated keyring dir This helps to structure the layout of the repository better by having one root folder that contains the actual decomposed keyring structure. --- Makefile | 2 +- README.md | 4 ++-- keyringctl | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 0e2de1d..a6ddec8 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ PREFIX ?= /usr/local KEYRING_TARGET_DIR=$(DESTDIR)$(PREFIX)/share/pacman/keyrings/ -KEYRING_FILES=$(wildcard output/*.gpg) $(wildcard output/*-revoked) $(wildcard output/*-trusted) +KEYRING_FILES=$(wildcard keyring/output/*.gpg) $(wildcard keyring/output/*-revoked) $(wildcard keyring/output/*-trusted) all: build diff --git a/README.md b/README.md index 4fffc0a..ec34fbd 100644 --- a/README.md +++ b/README.md @@ -6,8 +6,8 @@ The keyring is used by pacman to establish the web of trust for the packagers of the distribution. The PGP packets describing the main signing keys can be found below the -[main](main) directory, while those of the packagers are located below the -[packager](packager) directory. +[keyring/main](keyring/main) directory, while those of the packagers are located below the +[keyring/packager](keyring/packager) directory. ## Requirements diff --git a/keyringctl b/keyringctl index 92b26bc..993ff95 100755 --- a/keyringctl +++ b/keyringctl @@ -1196,7 +1196,7 @@ if __name__ == "__main__": # temporary working directory that gets auto cleaned with TemporaryDirectory(prefix="arch-keyringctl-") as tempdir: - keyring_root = Path().absolute() + keyring_root = Path("keyring").absolute() working_dir = Path(tempdir) debug(f"Working directory: {working_dir}") with cwd(working_dir):