You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@buildr.apache.org by to...@apache.org on 2010/03/30 03:34:51 UTC

svn commit: r928961 - /buildr/trunk/rakelib/stage.rake

Author: toulmean
Date: Tue Mar 30 01:34:51 2010
New Revision: 928961

URL: http://svn.apache.org/viewvc?rev=928961&view=rev
Log:
in case gpg2 is not installed but gpg is, try both

Modified:
    buildr/trunk/rakelib/stage.rake

Modified: buildr/trunk/rakelib/stage.rake
URL: http://svn.apache.org/viewvc/buildr/trunk/rakelib/stage.rake?rev=928961&r1=928960&r2=928961&view=diff
==============================================================================
--- buildr/trunk/rakelib/stage.rake (original)
+++ buildr/trunk/rakelib/stage.rake Tue Mar 30 01:34:51 2010
@@ -47,7 +47,9 @@ task :prepare do |task, args|
   # Need GPG to sign the packages.
   lambda do
     args.gpg or fail "Please run with gpg=<argument for gpg --local-user>"
-    fail "No GPG user #{args.gpg}" if `gpg2 --list-keys #{args.gpg}`.empty?
+    gpg_ok = `gpg2 --list-keys #{args.gpg}`
+    gpg_ok = `gpg --list-keys #{args.gpg}` if !$?.success?
+    fail "No GPG user #{args.gpg}" if gpg_ok.empty?
   end.call
 
   task(:license).invoke