Author: vborja
Date: Mon Oct 20 14:05:40 2008
New Revision: 706412
URL: http://svn.apache.org/viewvc?rev=706412&view=rev
Log:
removed some code dupplication.
Modified:
incubator/buildr/trunk/addon/buildr/drb.rb
Modified: incubator/buildr/trunk/addon/buildr/drb.rb
URL:
http://svn.apache.org/viewvc/incubator/buildr/trunk/addon/buildr/drb.rb?rev=706412&r1=706411&r2=706412&view=diff
==============================================================================
--- incubator/buildr/trunk/addon/buildr/drb.rb (original)
+++ incubator/buildr/trunk/addon/buildr/drb.rb Mon Oct 20 14:05:40 2008
@@ -195,14 +195,12 @@
init 'Distributed Buildr'
if @rakefile
if buildfile_needs_reload?
- reload_buildfile(server.original)
- server.save_snapshot(self)
+ reload_buildfile(server, server.original)
else
clear_invoked_tasks(server.snapshot || server.original)
end
else
- reload_buildfile(server.original)
- server.save_snapshot(self)
+ reload_buildfile(server, server.original)
end
top_level
end
@@ -217,16 +215,16 @@
[EMAIL PROTECTED] || @last_loaded < buildfile.timestamp
end
- def reload_buildfile(snapshot)
+ def reload_buildfile(server, snapshot)
clear_for_reload(snapshot)
load_buildfile
buildfile_reloaded!
+ server.save_snapshot(self)
end
def clear_for_reload(snapshot)
Project.clear
- @tasks = {}
- snapshot.tasks.each_pair { |name, saved| saved.define! }
+ clear_invoked_tasks(snapshot)
@rules = snapshot.rules.clone
Layout.default = snapshot.layout.clone
end
