diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rwxr-xr-x | lib/rake.rb | 8 |
2 files changed, 10 insertions, 4 deletions
@@ -1,3 +1,9 @@ +Sat Oct 11 08:51:13 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * 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 <ko1@atdot.net> * 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 |