svn commit: r930787 - in /buildr/trunk: CHANGELOG lib/buildr/core/application.rb

[to...@apache.org]

Author: toulmean
Date: Mon Apr  5 03:21:57 2010
New Revision: 930787

URL: http://svn.apache.org/viewvc?rev=930787&view=rev
Log:
fix for BUILDR-404 buildr -V causes exception on JRuby

Modified:
    buildr/trunk/CHANGELOG
    buildr/trunk/lib/buildr/core/application.rb

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=930787&r1=930786&r2=930787&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Mon Apr  5 03:21:57 2010
@@ -117,6 +117,7 @@
 * Fixed:  Removed redundant tracing of command arguments
 * Fixed:  filter.using(hash) now correctly substitutes mappings with boolean
           "false" value
+* Fixed:  BUILDR-404 buildr -V causes exception on JRuby
 * Fixed:  BUILDR-411: fix for RDoc generation
 1.3.5 (2009-10-05)
 * Added:  Interactive shell (REPL) support

Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=930787&r1=930786&r2=930787&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Mon Apr  5 03:21:57 2010
@@ -354,7 +354,7 @@ module Buildr
         ],
         ['--version', '-V', "Display the program version.",
           lambda { |value|
-            puts "Buildr #{Buildr::VERSION} #{RUBY_PLATFORM[/java/] && '(JRuby '+ (Buildr.settings.build['jruby'] || JRUBY_VERSION) +')'}"
+            puts "Buildr #{Buildr::VERSION}#{RUBY_PLATFORM[/java/] ? " (JRuby #{JRUBY_VERSION})" : ""}"
             exit 0
           }
         ]