summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrhatto <rhatto@ratatosk.fluxo.info>2014-04-06 20:37:42 -0300
committerrhatto <rhatto@ratatosk.fluxo.info>2014-04-06 20:37:42 -0300
commit9218a6dfa42cc9a83d754d4c47b562a31102cf30 (patch)
treecbf0e05e63c3fb6735dfb160d15580439fb266f6
parent23f21f59d9075f36c273e48f8f993a8018cec102 (diff)
downloadkeyringer-9218a6dfa42cc9a83d754d4c47b562a31102cf30.tar.gz
keyringer-9218a6dfa42cc9a83d754d4c47b562a31102cf30.tar.bz2
Fix recryption error when using gpg-agent in text mode
-rw-r--r--ChangeLog2
-rwxr-xr-xlib/keyringer/actions/recrypt2
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 8e4d5c9..73849ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2014-04-06 - Silvio Rhatto <rhatto@riseup.net>
+ Fix recryption error when using gpg-agent in text mode (#55)
+
Be more verbose on recrypt errors
Adding "commit" action which is a wrapper around "git commit"
diff --git a/lib/keyringer/actions/recrypt b/lib/keyringer/actions/recrypt
index d374308..30c9254 100755
--- a/lib/keyringer/actions/recrypt
+++ b/lib/keyringer/actions/recrypt
@@ -16,7 +16,7 @@ function keyringer_recrypt {
keyringer_set_recipients "$FILE"
# Decrypt
- decrypted="$($GPG --use-agent -d "$KEYDIR/$FILE" 2> /dev/null)"
+ decrypted="$($GPG --use-agent -d "$KEYDIR/$FILE")"
if [ "$?" != "0" ]; then
echo "Decryption error on $1."