зеркало из https://github.com/github/ruby.git
* ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored
before RUBYLIB, even if MANGLED_PATH is enabled. fixed #1679. MANGLED_PATH is disabled by the default and will be removed completely in the future. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32310 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
Родитель
7ed1803137
Коммит
65c2fec50c
|
@ -1,3 +1,10 @@
|
|||
Thu Jun 30 06:37:43 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* ruby.c (ruby_init_loadpath_safe): ensure RUBYLIB_PREFIX stored
|
||||
before RUBYLIB, even if MANGLED_PATH is enabled. fixed #1679.
|
||||
MANGLED_PATH is disabled by the default and will be removed
|
||||
completely in the future.
|
||||
|
||||
Thu Jun 30 06:32:21 2011 Eric Hodel <drbrain@segment7.net>
|
||||
|
||||
* lib/drb/drb.rb: Hide deprecated toplevel DRb constants.
|
||||
|
|
3
ruby.c
3
ruby.c
|
@ -441,6 +441,9 @@ ruby_init_loadpath_safe(int safe_level)
|
|||
load_path = GET_VM()->load_path;
|
||||
|
||||
if (safe_level == 0) {
|
||||
#ifdef MANGLED_PATH
|
||||
rubylib_mangled_path("", 0);
|
||||
#endif
|
||||
ruby_push_include(getenv("RUBYLIB"), identical_path);
|
||||
}
|
||||
|
||||
|
|
Загрузка…
Ссылка в новой задаче