From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.42.240.136 with SMTP id la8cs109922icb; Sun, 30 Jan 2011 15:22:30 -0800 (PST) Received: by 10.229.96.133 with SMTP id h5mr5303849qcn.147.1296429750147; Sun, 30 Jan 2011 15:22:30 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id u18si42996808qcr.57.2011.01.30.15.22.29; Sun, 30 Jan 2011 15:22:30 -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; dkim=neutral (body hash did not verify) header.i=@gmail.com Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 92B50197833E; Sun, 30 Jan 2011 18:22:29 -0500 (EST) Received: from mail-wy0-f178.google.com (mail-wy0-f178.google.com [74.125.82.178]) by rubyforge.org (Postfix) with ESMTP id 7C5131858267 for ; Sun, 30 Jan 2011 17:57:09 -0500 (EST) Received: by wyb42 with SMTP id 42so5354030wyb.23 for ; Sun, 30 Jan 2011 14:57:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:content-type:subject:from:to:date:message-id :user-agent:content-transfer-encoding; bh=RP6qaAl9JPxJt4IXLSKZ+4k2QMOjAB0ijzT58ZDGQG0=; b=gnYVQ1C5ZOxown2hSqU4oiYiObZ8GqNxNYG3Uo79JMND5DlEsDYjurxD4adVaszu6P dN8xnszLDIuamo3etxBVkmZm2ba7VM0bQYpIkvN+1iASktiORdIosZyOlmuwhM+jBUUb S5Ra1WmiYKgWe6c1aNam/ngS3lcsNqmrIQP6k= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=content-type:subject:from:to:date:message-id:user-agent :content-transfer-encoding; b=BAoejHbxhQrLyXF6zLryBscQy2kzeIjtFX95QG1ETZ15UsmHvGuT1LAC1Kqv1axZ2x MW7UETvSdvdpiI1EGH4AFsApyxnHPuxX7B0ejzrXSlxRaWAbqeA5GIRnLoLbToNlET2i 0c++PsEclHw0VGVE4Kz0PWN0l0zG0PzHA9JAc= Received: by 10.227.157.205 with SMTP id c13mr5318454wbx.136.1296428228649; Sun, 30 Jan 2011 14:57:08 -0800 (PST) Received: from localhost (cpc12-cmbg15-2-0-cust81.5-4.cable.virginmedia.com [86.30.247.82]) by mx.google.com with ESMTPS id w25sm3620102wbd.11.2011.01.30.14.57.05 (version=TLSv1/SSLv3 cipher=RC4-MD5); Sun, 30 Jan 2011 14:57:07 -0800 (PST) From: Hamish To: sup-devel Date: Sun, 30 Jan 2011 22:57:02 +0000 Message-Id: <1296426286-sup-8656@whisper> User-Agent: Sup/git Subject: [sup-devel] Fixed bug with messages not being signed. X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: 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 Found the bug that stopped people signing email. Needed to use merge! rather than merge. Real slap on head moment. I've committed it to the (existing) gpgme branch and to next. Hamish Downer Full patch is: commit 42149329b37af5e3fc0183367521999c479b7881 Author: Hamish Downer Date: Sun Jan 30 22:44:05 2011 +0000 Fixed the bug that stopped emails being signed. Schoolboy error - needed merge! rather than merge diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb index e532261..5f1b730 100644 --- a/lib/sup/crypto.rb +++ b/lib/sup/crypto.rb @@ -57,7 +57,7 @@ EOS return unknown_status(cant_find_gpgme) unless @gpgme_present gpg_opts = {:protocol => GPGME::PROTOCOL_OpenPGP, :armor => true, :textmode => true} - gpg_opts.merge(gen_sign_user_opts(from)) + gpg_opts.merge!(gen_sign_user_opts(from)) gpg_opts = HookManager.run("gpg-options", {:operation => "sign", :options => gpg_opts}) || gpg_opts @@ -82,8 +82,8 @@ EOS gpg_opts = {:protocol => GPGME::PROTOCOL_OpenPGP, :armor => true, :textmode => true} if sign - gpg_opts.merge(gen_sign_user_opts(from)) - gpg_opts.merge({:sign => true}) + gpg_opts.merge!(gen_sign_user_opts(from)) + gpg_opts.merge!({:sign => true}) end gpg_opts = HookManager.run("gpg-options", {:operation => "encrypt", :options => gpg_opts}) || gpg_opts _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel