Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-09-20 19:36:14 -0500
committerDan McGee <dan@archlinux.org>2011-09-22 11:14:35 -0500
commita7691ba6fd6f87cae6210c304235c709e4f9a60e (patch)
treef3770df8d7e2e46d411b703340e31d4ba247b195 /scripts
parent4b6a5ae1599807d60568bb617483ffe368745ac0 (diff)
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>
Diffstat (limited to 'scripts')
-rw-r--r--scripts/pacman-key.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/pacman-key.sh.in b/scripts/pacman-key.sh.in
index b3f5259e..82131e91 100644
--- a/scripts/pacman-key.sh.in
+++ b/scripts/pacman-key.sh.in
@@ -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