From e9fff84b956802585b8aa706ff11fc2644f70b70 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 10 Oct 2008 23:51:16 +0000 Subject: * lib/rake.rb (Rake::Application#standard_exception_handling): removed unnecessary SystemExit, and exits with false instead of system dependent value. [ruby-talk:317330] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19755 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 6 ++++++ lib/rake.rb | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ef53b86b1..7943b47346 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Sat Oct 11 08:51:13 2008 Nobuyoshi Nakada + + * lib/rake.rb (Rake::Application#standard_exception_handling): removed + unnecessary SystemExit, and exits with false instead of system + dependent value. [ruby-talk:317330] + Sat Oct 11 03:54:05 2008 Koichi Sasada * parse.y: optimize 'for' statement when one variable given. diff --git a/lib/rake.rb b/lib/rake.rb index f78cd3cd3d..480068be7a 100755 --- a/lib/rake.rb +++ b/lib/rake.rb @@ -2032,10 +2032,10 @@ module Rake yield rescue SystemExit => ex # Exit silently with current status - exit(ex.status) - rescue SystemExit, OptionParser::InvalidOption => ex + raise + rescue OptionParser::InvalidOption => ex # Exit silently - exit(1) + exit(false) rescue Exception => ex # Exit with error message $stderr.puts "rake aborted!" @@ -2046,7 +2046,7 @@ module Rake $stderr.puts ex.backtrace.find {|str| str =~ /#{@rakefile}/ } || "" $stderr.puts "(See full trace by running task with --trace)" end - exit(1) + exit(false) end end -- cgit v1.2.3