[etch-devel] SF.net SVN: etch:[335] trunk/client/lib/etch/client.rb

[<jh...@us...>]

Revision: 335
          http://etch.svn.sourceforge.net/etch/?rev=335&view=rev
Author:   jheiss
Date:     2012-04-30 01:02:58 +0000 (Mon, 30 Apr 2012)
Log Message:
-----------
When processing dependencies we need to pay attention to the return
value from process_file or process_command

Modified Paths:
--------------
    trunk/client/lib/etch/client.rb

Modified: trunk/client/lib/etch/client.rb
===================================================================
--- trunk/client/lib/etch/client.rb	2012-04-28 02:00:29 UTC (rev 334)
+++ trunk/client/lib/etch/client.rb	2012-04-30 01:02:58 UTC (rev 335)
@@ -653,13 +653,19 @@
         # Process any other files that this file depends on
         config.elements.each('/config/depend') do |depend|
           puts "Processing dependency #{depend.text}" if (@debug)
-          process_file(depend.text, responsedata)
+          continue_processing = process_file(depend.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # Process any commands that this file depends on
         config.elements.each('/config/dependcommand') do |dependcommand|
           puts "Processing command dependency #{dependcommand.text}" if (@debug)
-          process_commands(dependcommand.text, responsedata)
+          continue_processing = process_commands(dependcommand.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # See what type of action the user has requested
@@ -1573,13 +1579,19 @@
         # Process any other commands that this command depends on
         command.elements.each('/commands/depend') do |depend|
           puts "Processing command dependency #{depend.text}" if (@debug)
-          process_commands(depend.text, responsedata)
+          continue_processing = process_commands(depend.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # Process any files that this command depends on
         command.elements.each('/commands/dependfile') do |dependfile|
           puts "Processing file dependency #{dependfile.text}" if (@debug)
-          process_file(dependfile.text, responsedata)
+          continue_processing = process_file(dependfile.text, responsedata)
+          if !continue_processing
+            throw :process_done
+          end
         end
         
         # Perform each step

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.