aboutsummaryrefslogtreecommitdiff
path: root/lib/keyringer
diff options
context:
space:
mode:
authorrhatto <rhatto@ratten.fluxo.info>2014-03-17 18:33:49 -0300
committerrhatto <rhatto@ratten.fluxo.info>2014-03-17 18:33:49 -0300
commite5f6e907fc5f08ec83beb27bb8358c477acc5b9c (patch)
tree33828414169c13a2a0266ebc2bc3aa5443f6a54c /lib/keyringer
parentf2b6656b05fae5f3adccaa371d085c6fd6c82b8c (diff)
parentdccfd2ba85988f52584ad6cb4ff91ab6aa6007bd (diff)
downloadkeyringer-e5f6e907fc5f08ec83beb27bb8358c477acc5b9c.tar.gz
keyringer-e5f6e907fc5f08ec83beb27bb8358c477acc5b9c.tar.bz2
Merge branch 'master' into canary
Diffstat (limited to 'lib/keyringer')
-rwxr-xr-xlib/keyringer/functions8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/keyringer/functions b/lib/keyringer/functions
index 832385e..5936ff0 100755
--- a/lib/keyringer/functions
+++ b/lib/keyringer/functions
@@ -544,7 +544,7 @@ function keyringer_check_repository {
# Git maintenance operations
echo "Running git maintenance operations..."
keyringer_exec git "$BASEDIR" fsck
- keyringer_exec git "$BASEDIR" gc --prune=all
+ keyringer_exec git "$BASEDIR" gc
echo ""
# Sync the repository
@@ -581,7 +581,7 @@ function keyringer_check_recipient_size {
local size=$(echo "$recipient" | wc -c)
if (( $size < 41 )); then
- echo "Fatal: please set the full GPG signature hash for key ID $recipient:"
+ echo "Fatal: please set the full OpenPGP fingerprint for key ID $recipient:"
cat <<-EOF
Please provide a full OpenPGP fingerprint, for example:
@@ -671,8 +671,8 @@ function keyringer_check_recipient_key {
fi
echo ""
else
- echo "Fatal: no such key $recipient on your GPG keyring."
- echo "Please check for this key or fix the recipient file."
+ echo "Fatal: no such key $recipient on your OpenPGP keyring."
+ echo "Please retrieve this key yourself or fix the recipient file."
exit 1
fi