nobu	2011-06-30 06:37:48 +0900 (Thu, 30 Jun 2011)

  New Revision: 32310

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32310

  Log:
    * 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.

  Modified files:
    trunk/ChangeLog
    trunk/ruby.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32309)
+++ ChangeLog	(revision 32310)
@@ -1,3 +1,10 @@
+Thu Jun 30 06:37:43 2011  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@s...>
 
 	* lib/drb/drb.rb:  Hide deprecated toplevel DRb constants.
Index: ruby.c
===================================================================
--- ruby.c	(revision 32309)
+++ ruby.c	(revision 32310)
@@ -441,6 +441,9 @@
     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);
     }
 

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/