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

[as...@apache.org]

Author: assaf
Date: Fri Mar 13 05:51:03 2009
New Revision: 753134

URL: http://svn.apache.org/viewvc?rev=753134&view=rev
Log:
Fixed: BUILDR-255 tasks/*.rake files are loaded more than once.

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=753134&r1=753133&r2=753134&view=diff
==============================================================================
--- buildr/trunk/CHANGELOG (original)
+++ buildr/trunk/CHANGELOG Fri Mar 13 05:51:03 2009
@@ -60,6 +60,7 @@
 for submodules (Rhett Sutphin).
 * Fixed:  BUILDR-247 OpenObject does not work with Hash#only (Rhett Sutphin).
 * Fixed:  BUILDR-253 ZipTask now uses Zlib::DEFAULT_COMPRESSION instead of NO_COMPRESSION
+* Fixed:  BUILDR-255 tasks/*.rake files are loaded more than once.
 * Fixed:  BUILDR-261 ScalaSpecs should be run with Scala dependencies
 * Fixed:  BUILDR-263 package(:war).merge not working correctly with exclude()
 * Remove: BUILDR-215 buildr:freeze and unfreeze tasks don't work since we're

Modified: buildr/trunk/lib/buildr/core/application.rb
URL: http://svn.apache.org/viewvc/buildr/trunk/lib/buildr/core/application.rb?rev=753134&r1=753133&r2=753134&view=diff
==============================================================================
--- buildr/trunk/lib/buildr/core/application.rb (original)
+++ buildr/trunk/lib/buildr/core/application.rb Fri Mar 13 05:51:03 2009
@@ -458,8 +458,6 @@
       files = [ File.expand_path('buildr.rb', ENV['HOME']), 'buildr.rb' ].select { |file| File.exist?(file) }
       files += [ File.expand_path('buildr.rake', ENV['HOME']), File.expand_path('buildr.rake') ].
         select { |file| File.exist?(file) }.each { |file| warn "Please use '#{file.ext('rb')}' instead of '#{file}'" }
-      #Load local tasks that can be used in the Buildfile.
-      files += Dir[File.expand_path('tasks/*.rake')]
       files.each do |file|
         unless $LOADED_FEATURES.include?(file)
           load file