moparisthebest
/
pacman
mirror of https://github.com/moparisthebest/pacman
1
0
Fork 0
Code Issues Releases Wiki Activity

pacman-key: clarify messages, s/keychain/keyring/ 

Signed-off-by: Dan McGee <dan@archlinux.org>
This commit is contained in:
Dan McGee 2012-02-02 08:29:50 -06:00
parent 3f202c7808
commit 9e2078b179
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -116,11 +116,11 @@ get_from() {
generate_master_key() { generate_master_key() {
# Generate the master key, which will be in both pubring and secring # Generate the master key, which will be in both pubring and secring
"${GPG_PACMAN[@]}" --gen-key --batch <<EOF "${GPG_PACMAN[@]}" --gen-key --batch <<EOF
%echo Generating pacman keychain master key... %echo Generating pacman keyring master key...
Key-Type: RSA Key-Type: RSA
Key-Length: 2048 Key-Length: 2048
Key-Usage: sign Key-Usage: sign
Name-Real: Pacman Keychain Master Key Name-Real: Pacman Keyring Master Key
Name-Email: pacman@localhost Name-Email: pacman@localhost
Expire-Date: 0 Expire-Date: 0
%commit %commit
@ -315,7 +315,7 @@ populate_keyring() {
add_keys() { add_keys() {
if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}" ; then if ! "${GPG_PACMAN[@]}" --quiet --batch --import "${KEYFILES[@]}" ; then
error "$(gettext "A specified keyfile could not be added to the gpg keychain.")" error "$(gettext "A specified keyfile could not be added to the keyring.")"
exit 1 exit 1
fi fi
} }
@ -323,7 +323,7 @@ add_keys() {
delete_keys() { delete_keys() {
check_keyids_exist check_keyids_exist
if ! "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}" ; then if ! "${GPG_PACMAN[@]}" --quiet --batch --delete-key --yes "${KEYIDS[@]}" ; then
error "$(gettext "A specified key could not be removed from the gpg keychain.")" error "$(gettext "A specified key could not be removed from the keyring.")"
exit 1 exit 1
fi fi
} }
@ -345,7 +345,7 @@ edit_keys() {
export_keys() { export_keys() {
check_keyids_exist check_keyids_exist
if ! "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}" ; then if ! "${GPG_PACMAN[@]}" --armor --export "${KEYIDS[@]}" ; then
error "$(gettext "A specified key could not be exported from the gpg keychain.")" error "$(gettext "A specified key could not be exported from the keyring.")"
exit 1 exit 1
fi fi
} }