diff options
| author | Louise Crow <louise.crow@gmail.com> | 2014-03-04 10:46:46 +0000 | 
|---|---|---|
| committer | Louise Crow <louise.crow@gmail.com> | 2014-03-04 10:46:46 +0000 | 
| commit | ede46dc8dc6c97cdad8c3fcb3bd42ede5c25f395 (patch) | |
| tree | 44e03358c9fa7ca6826e631d1d3d6c1030b1b0d5 /lib/alaveteli_external_command.rb | |
| parent | 8e911d5bd0e60a0e0e4859868662cc176419d2e3 (diff) | |
| parent | a38b2989aebf8d554b7287e18528bed8c9e67d3b (diff) | |
Merge branch 'release/0.17'0.17
Diffstat (limited to 'lib/alaveteli_external_command.rb')
| -rw-r--r-- | lib/alaveteli_external_command.rb | 6 | 
1 files changed, 5 insertions, 1 deletions
diff --git a/lib/alaveteli_external_command.rb b/lib/alaveteli_external_command.rb index fbdee8a62..086a461c8 100644 --- a/lib/alaveteli_external_command.rb +++ b/lib/alaveteli_external_command.rb @@ -44,7 +44,11 @@ module AlaveteliExternalCommand              end              xc.run(opts[:stdin_string] || "", opts[:env] || {}) -            if xc.status != 0 +            if !xc.exited +                # Crash or timeout +                $stderr.puts("#{program_name} #{args.join(' ')}:exited abnormally") +                return nil +            elsif xc.status != 0                  # Error                  $stderr.puts("Error from #{program_name} #{args.join(' ')}:")                  $stderr.print(xc.err)  | 
