From: Tilman Sauerbeck <tilman@code-monkey.de>
Date: Tue, 15 Aug 2006 16:20:21 +0000 (+0200)
Subject: Fixed error handling in Rake::ConfigureTask::FooConfigTest#lookup_flags.
X-Git-Url: http://git.code-monkey.de/?p=ruby-vorbistagger.git;a=commitdiff_plain;h=ab5421339ffad5eb5c910f709354872fda7c34b3

Fixed error handling in Rake::ConfigureTask::FooConfigTest#lookup_flags.
---

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