Author: boisvert
Date: Fri Oct 1 05:05:38 2010
New Revision: 1003388
URL: http://svn.apache.org/viewvc?rev=1003388&view=rev
Log:
JavaRebel wasn't correctly detected.
("or" operator has lesser precedence than assignment)
Modified:
buildr/trunk/CHANGELOG
buildr/trunk/lib/buildr/shell.rb
Modified: buildr/trunk/CHANGELOG
URL:
http://svn.apache.org/viewvc/buildr/trunk/CHANGELOG?rev=1003388&r1=1003387&r2=1003388&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri Oct 1 05:05:38 2010
@@ -6,6 +6,7 @@
* Fixed: BUILDR-513 --trace fails with NoMethodError : undefined method
`include?' for nil:NilClass
* Fixed: BUILDR-515 -update-snapshot doesn't work as expected
+* Fixed: JavaRebel was previously not correctly detected
1.4.2 (2010-09-18)
* Added: BUILDR-415 Ability to exclude tests from command line
Modified: buildr/trunk/lib/buildr/shell.rb
URL:
http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/shell.rb?rev=1003388&r1=1003387&r2=1003388&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/shell.rb (original)
+++ buildr/trunk/lib/buildr/shell.rb Fri Oct 1 05:05:38 2010
@@ -77,14 +77,14 @@ module Buildr
module JavaRebel
def rebel_home
unless @rebel_home
- @rebel_home = ENV['REBEL_HOME'] or ENV['JREBEL'] or
ENV['JREBEL_HOME']
+ @rebel_home = ENV['REBEL_HOME'] || ENV['JREBEL'] ||
ENV['JREBEL_HOME']
- if @rebel_home and File.directory? @rebel_home
+ if @rebel_home && File.directory? @rebel_home
@rebel_home += File::SEPARATOR + 'jrebel.jar'
end
end
- if @rebel_home and File.exists? @rebel_home
+ if @rebel_home && File.exists? @rebel_home
@rebel_home
else
nil
