commit f259a4fe71987b5db60ac206bce86b2c69cf2ddc
parent abae119526c5c705042679f17b04c39c28b97cb2
Author: Sascha Silbe <sascha-pgp@silbe.org>
Date: Tue, 18 Jan 2011 19:31:21 +0100
gen_sign_user_opts: fall back to default account if no account matches sender
Fixes the following exception:
NoMethodError from thread: main
undefined method `gpgkey' for nil:NilClass
./lib/sup/crypto.rb:226:in `gen_sign_user_opts'
./lib/sup/crypto.rb:48:in `sign'
./lib/sup/util.rb:609:in `send'
./lib/sup/util.rb:609:in `method_missing'
./lib/sup/modes/edit-message-mode.rb:411:in `send'
./lib/sup/modes/edit-message-mode.rb:411:in `build_message'
./lib/sup/modes/edit-message-mode.rb:354:in `send_message'
./lib/sup/mode.rb:59:in `send'
./lib/sup/mode.rb:59:in `handle_input'
./lib/sup/buffer.rb:277:in `handle_input'
bin/sup:260
Signed-off-by: Sascha Silbe
Diffstat:
1 file changed, 1 insertion(+), 0 deletions(-)
diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
@@ -323,6 +323,7 @@ private
# else set --local-user from_email_address
def gen_sign_user_opts from
account = AccountManager.account_for from
+ account ||= AccountManager.default_account
if !account.gpgkey.nil?
opts = {:signers => account.gpgkey}
elsif AccountManager.user_emails.length == 1