From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.229.71 with SMTP id jh7cs146480icb; Tue, 18 Jan 2011 10:54:58 -0800 (PST) Received: by 10.151.144.9 with SMTP id w9mr1394998ybn.174.1295376898126; Tue, 18 Jan 2011 10:54:58 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id j12si12309575qcu.3.2011.01.18.10.54.57; Tue, 18 Jan 2011 10:54:58 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 7C56C185835E; Tue, 18 Jan 2011 13:54:57 -0500 (EST) Received: from smtp.chost.de (setoy.chost.de [217.160.209.225]) by rubyforge.org (Postfix) with ESMTP id 59802185831A for ; Tue, 18 Jan 2011 13:31:27 -0500 (EST) Received: (qmail 30181 invoked by uid 5015); 18 Jan 2011 18:31:35 -0000 Received: (nullmailer pid 31545 invoked by uid 8193); Tue, 18 Jan 2011 18:31:26 -0000 Received: (nullmailer pid 2736 invoked by uid 8193); Tue, 18 Jan 2011 18:31:23 -0000 From: Sascha Silbe To: sup-devel Date: Tue, 18 Jan 2011 19:31:21 +0100 Message-Id: <1295375481-2615-1-git-send-email-sascha-pgp@silbe.org> X-Mailer: git-send-email 1.7.2.3 Mail-Followup-To: Subject: [sup-devel] [PATCH] gen_sign_user_opts: fall back to default account if no account matches sender X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sascha Silbe , Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org 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 --- The exception originally occured prior to merging the gpgme patch and I didn't re-test without the patch, but since this part of the code hasn't changed I expect the results to be the same. lib/sup/crypto.rb | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb index f8e16c5..02f14d0 100644 --- 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 -- 1.7.2.3 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel