Merge branch 'next' of gitorious.org:sup/mainline into next

stlawrance · Jan 7, 2012 · ebf92bd · ebf92bd
2 parents c029e7f + b8c42da
commit ebf92bd
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/bin/sup b/bin/sup
@@ -12,6 +12,8 @@ end
 
 no_gpgme = false
 begin
+  # gpgme broke its API in 2.0, so make sure we have the old version for now.
+  gem 'gpgme', '=1.0.8'
   require 'gpgme'
 rescue LoadError
   no_gpgme = true

diff --git a/lib/sup/crypto.rb b/lib/sup/crypto.rb
@@ -1,4 +1,6 @@
 begin
+  # gpgme broke its API in 2.0, so make sure we have the old version for now.
+  gem 'gpgme', '=1.0.8'
   require 'gpgme'
 rescue LoadError
 end