1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* gem_prelude.rb: disables debug and verbose flags to suppress failure

Browse Source 
messages.  interpolation does not occur inside single quotes.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@19949 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2008-10-26 10:18:39 +00:00
parent b98a6b7ac0
commit 945faf92e6
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,4 +1,4 @@
Sun Oct 26 18:42:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Oct 26 19:18:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* thread.c (blocking_region_{begin,end}): declared as inline. * thread.c (blocking_region_{begin,end}): declared as inline.
@ -11,6 +11,9 @@ Sun Oct 26 18:42:18 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/io/wait/{extconf.rb,wait.c}: needs sys/ioctl.h for fcntl on * ext/io/wait/{extconf.rb,wait.c}: needs sys/ioctl.h for fcntl on
cygwin. cygwin.
* gem_prelude.rb: disables debug and verbose flags to suppress failure
messages. interpolation does not occur inside single quotes.
* test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems * test/ruby/envutil.rb (assert_in_out_err): disables builtin rubygems
to get rid of the interference. to get rid of the interference.

30
gem_prelude.rb
View File

@ -80,18 +80,24 @@ if defined?(Gem) then
GEM_PRELUDE_METHODS = Gem.methods(false) GEM_PRELUDE_METHODS = Gem.methods(false)
require 'rubygems/defaults'
begin begin
require 'rubygems/defaults/operating_system' verbose, debug = $VERBOSE, $DEBUG
rescue LoadError $VERBOSE = $DEBUG = nil
end require 'rubygems/defaults'
if defined?(RUBY_ENGINE) then
begin begin
require 'rubygems/defaults/#{RUBY_ENGINE}' require 'rubygems/defaults/operating_system'
rescue LoadError rescue LoadError
end end
if defined?(RUBY_ENGINE) then
begin
require "rubygems/defaults/#{RUBY_ENGINE}"
rescue LoadError
end
end
ensure
$VERBOSE, $DEBUG = verbose, debug
end end
module QuickLoader module QuickLoader
@ -183,12 +189,12 @@ if defined?(Gem) then
require_paths = [] require_paths = []
GemPaths.values.each do |path| GemPaths.each_value do |path|
if File.exist?(File.join(path, ".require_paths")) if File.exist?(file = File.join(path, ".require_paths"))
require_paths.concat(File.read(File.join(path, ".require_paths")).split.map {|require_path| File.join(path, require_path)}) require_paths.concat(File.read(file).split.map {|require_path| File.join(path, require_path)})
else else
require_paths << File.join(path, "bin") if File.exist?(File.join(path, "bin")) require_paths << file if File.exist?(file = File.join(path, "bin"))
require_paths << File.join(path, "lib") if File.exist?(File.join(path, "lib")) require_paths << file if File.exist?(file = File.join(path, "lib"))
end end
end end