mirror of
https://github.com/moparisthebest/pacman
synced 2024-10-31 15:45:03 -04:00
pacman-key: clean up populate output
* Ensure usage message is indented correctly * Show short filenames for both the gpg keyring and revocation file Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
parent
4b6a5ae159
commit
a7691ba6fd
@ -80,7 +80,7 @@ usage() {
|
||||
echo "$(gettext " --keyserver Specify a keyserver to use if necessary")"
|
||||
echo "$(gettext " --list-sigs [keyid(s)] List keys and their signatures")"
|
||||
echo "$(gettext " --lsign-key <keyid> Locally sign the specified keyid")"
|
||||
printf "$(gettext " --populate [keyring(s)] Reload the default keys from the (given) keyrings\n\
|
||||
printf "$(gettext " --populate [keyring(s)] Reload the default keys from the (given) keyrings\n\
|
||||
in '%s'")\n" "@pkgdatadir@/keyrings"
|
||||
echo "$(gettext " --refresh-keys [keyid(s)] Update specified or all keys from a keyserver")"
|
||||
}
|
||||
@ -205,13 +205,13 @@ verify_keyring_input() {
|
||||
local keyring
|
||||
for keyring in "${KEYRINGIDS[@]}"; do
|
||||
if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}.gpg.sig" &>/dev/null; then
|
||||
error "$(gettext "The signature of file %s is not valid.")" "${ADDED_KEYS}"
|
||||
error "$(gettext "The signature of file %s is not valid.")" "${keyring}.gpg"
|
||||
ret=1
|
||||
fi
|
||||
|
||||
if [[ -f "${KEYRING_IMPORT_DIR}/${keyring}-revoked" ]]; then
|
||||
if ! "${GPG_PACMAN[@]}" --verify "${KEYRING_IMPORT_DIR}/${keyring}-revoked.sig" &>/dev/null; then
|
||||
error "$(gettext "The signature of file %s is not valid.")" "${KEYRING_IMPORT_DIR}/${keyring}-revoked"
|
||||
error "$(gettext "The signature of file %s is not valid.")" "${keyring}-revoked"
|
||||
ret=1
|
||||
fi
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user