diff options
Diffstat (limited to 'bin/pacman-make-keyring')
-rwxr-xr-x | bin/pacman-make-keyring | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/bin/pacman-make-keyring b/bin/pacman-make-keyring index 3951361..589984d 100755 --- a/bin/pacman-make-keyring +++ b/bin/pacman-make-keyring @@ -81,6 +81,7 @@ $(cachedir)/deps.mk: ${users} $(var)outputdir $(var)cachedir $(var)KEYRING_NAME| { \ echo $(outputdir)/${KEYRING_NAME}.gpg: $$($(bin)/pgp-list-keyids | sed -r 's|(\S+) .*|$$(cachedir)/keys/\1.asc|') && \ echo $(cachedir)/stamp.ownertrust: $$($(bin)/pgp-list-keyids | sed -rn 's|^(trusted/\S+) .*|$$(cachedir)/keys/\1.asc|p') && \ + $(bin)/pgp-list-keyids | sed -rn 's|^trusted/(\S+) (.*)|keyid.\1 = \2|p' && \ $(bin)/uid-map | sed 's|.*|trusted:&\nsecondary:&\nrevoked:&|' | sed -r 's|(.*):(.*):(.*)|$$(cachedir)/keys/\1/\3.asc: $$(yamldir)/\2.yml|' && \ :; }> $@ -include $(cachedir)/deps.mk @@ -114,7 +115,7 @@ $(cachedir)/stamp.gpg-init: $(cachedir)/txt.gpg-init $(var)GPG | $(cachedir)/gpg # The appropriate ${uid}.yml file is added as a dependency to # ${username}.yml by deps.mk -keyid=$$($(bin)/pgp-get-keyid-by-uid $(patsubst %.yml,%,$(notdir $(filter %.yml,$^)))) +keyid=$(keyid.$(patsubst %.asc,%,$(notdir $@))) # In 'update-keys', this is the 'master-keyids' loop $(outputdir)/${KEYRING_NAME}-trusted: ${users} | $(outputdir) |