Merge pull request ddollar#273 from silviorelli/master

Fix for fix on issue ddollar#260
saulius · Oct 8, 2012 · 73fc059 · 73fc059
2 parents 3a101ec + f7b7029
commit 73fc059
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/foreman/engine.rb b/lib/foreman/engine.rb
@@ -273,7 +273,8 @@ def watch_for_output
     Thread.new do
       begin
         loop do
-          (IO.select(@readers.values, nil, nil, 30).first || []).each do |reader|
+          io = IO.select(@readers.values, nil, nil, 30)
+          (io.nil? ? [] : io.first).each do |reader|
             data = reader.gets
             output_with_mutex name_for(@readers.invert[reader]), data
           end