diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-15 15:55:36 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2016-06-15 15:55:36 -0400 |
| commit | 8736082d1b0eb9a1af8265bc443f2058550e9925 (patch) | |
| tree | 2cf7e7af383c61b8772ced9c66b8a2b5bea255ac /bin/pacman-make-keyring | |
| parent | a7ed703d2d983b0b7fd796fba60a2592e9edd262 (diff) | |
do away with pgp-get-keyid-by-uid
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) |