From ab5421339ffad5eb5c910f709354872fda7c34b3 Mon Sep 17 00:00:00 2001 From: Tilman Sauerbeck Date: Tue, 15 Aug 2006 18:20:21 +0200 Subject: [PATCH] Fixed error handling in Rake::ConfigureTask::FooConfigTest#lookup_flags. --- rake/configuretask.rb | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/rake/configuretask.rb b/rake/configuretask.rb index 08a4ebc..b673c84 100644 --- a/rake/configuretask.rb +++ b/rake/configuretask.rb @@ -178,17 +178,23 @@ module Rake def invoke return false unless can_exec_command? - [:version, :cflags, :libs].each do |f| - @result[f] = lookup_flags(f) + begin + [:version, :cflags, :libs].each do |f| + @result[f] = lookup_flags(f) + end + rescue Exception + @result.clear end - true + !@result.empty? end protected def lookup_flags(f) tmp = `#{@command} --#{f}`.strip - $?.exitstatus.zero? ? tmp : nil + + raise unless $?.exitstatus.zero? + tmp end private @@ -210,7 +216,9 @@ module Rake tmp = `#{@command} --silence-errors --#{f} #{@name}`. strip.tr("\n", "/") - $?.exitstatus.zero? ? tmp : nil + + raise unless $?.exitstatus.zero? + tmp end end -- 2.30.2