sup

commit 487659af4fd667c7da34af9f4a4516305a07e2cd
parent b5b0413e891dcb81460450e8ca96ac6506c3dada
Author: Hamish Downer <dmishd@gmail.com>
Date:   Sun, 30 Jan 2011 22:53:08 +0000

resolved merge conflict on gpgme signing fix

Diffstat:

1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
@@ -68,8 +68,8 @@ 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 = HookManager.run("gpg-options",
+    gpg_opts.merge!(gen_sign_user_opts(from))
+    gpg_opts = HookManager.run("gpg-options", 
                                {:operation => "sign", :options => gpg_opts}) || gpg_opts
 
     begin
@@ -93,8 +93,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