moparisthebest/pacman
1
0
Fork 0
mirror of https://github.com/moparisthebest/pacman synced 2024-10-31 15:45:03 -04:00
Code Issues Releases Wiki Activity

pacman-key: clean up populate output

Browse Source 
* 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:
Dan McGee 2011-09-20 19:36:14 -05:00
parent 4b6a5ae159
commit a7691ba6fd
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/pacman-key.sh.in
View File

@ -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