svn commit: r1068270 - in /buildr/trunk: CHANGELOG lib/buildr/core/util.rb

[bo...@apache.org]

Author: boisvert
Date: Tue Feb  8 04:56:01 2011
New Revision: 1068270

URL: http://svn.apache.org/viewvc?rev=1068270&view=rev
Log:
BUILDR-569 Buildr fails under JRuby 1.6.0.RC1 due to read-only $? variable

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

Modified: buildr/trunk/CHANGELOG
URL: http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1068270&r1=1068269&r2=1068270&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Tue Feb  8 04:56:01 2011
@@ -38,6 +38,7 @@
           (Tammo van Lessen)
 * Fixed:  BUILDR-562 WAR package isn't updated if files under src/main/webapp
           are updated
+* Fixed:  BUILDR-569 Buildr fails under JRuby 1.6.0.RC1 due to read-only $? variable
 * Fixed:  Scaladoc task would cause build to exit prematurely
 
 1.4.4 (2010-11-16)

Modified: buildr/trunk/lib/buildr/core/util.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/util.rb?rev=1068270&r1=1068269&r2=1068270&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/util.rb (original)
+++ buildr/trunk/lib/buildr/core/util.rb Tue Feb  8 04:56:01 2011
@@ -484,8 +484,8 @@ if Buildr::Util.java_platform?
           arg_str = args.map { |a| "'#{a}'" }
           __native_system__(cd + cmd.first + ' ' + arg_str.join(' '))
         end
-        $? = Buildr::ProcessStatus.new(0, res == 0, res)    # KLUDGE
-        block.call(res == 0, $?)
+        status = Buildr::ProcessStatus.new(0, res == 0, res)    # KLUDGE
+        block.call(res == 0, status)
       end
     end