sup

commit 42149329b37af5e3fc0183367521999c479b7881
parent 691d9cffc805aa58cc7f85647cb0cddad74a2aec
Author: Hamish Downer <dmishd@gmail.com>
Date:   Sun, 30 Jan 2011 22:44:05 +0000

Fixed the bug that stopped emails being signed.

Schoolboy error - needed merge! rather than merge

Diffstat:

1 file changed, 3 insertions(+), 3 deletions(-)
diff --git 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