naruse	2019-03-06 16:47:53 +0900 (Wed, 06 Mar 2019)

  New Revision: 67179

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=67179

  Log:
    merge revision(s) 67006: [Backport #15469]
    
    Ignore to add bundler lib direcotry if it is same as rubylibdir.
    
      [Bug #15469][ruby-core:90742]

  Modified directories:
    branches/ruby_2_6/
  Modified files:
    branches/ruby_2_6/lib/bundler/shared_helpers.rb
    branches/ruby_2_6/spec/bundler/bundler/shared_helpers_spec.rb
    branches/ruby_2_6/version.h
Index: ruby_2_6/lib/bundler/shared_helpers.rb
===================================================================
--- ruby_2_6/lib/bundler/shared_helpers.rb	(revision 67178)
+++ ruby_2_6/lib/bundler/shared_helpers.rb	(revision 67179)
@@ -340,7 +340,7 @@ module Bundler https://github.com/ruby/ruby/blob/trunk/ruby_2_6/lib/bundler/shared_helpers.rb#L340
 
     def set_rubylib
       rubylib = (ENV["RUBYLIB"] || "").split(File::PATH_SEPARATOR)
-      rubylib.unshift bundler_ruby_lib
+      rubylib.unshift bundler_ruby_lib unless RbConfig::CONFIG["rubylibdir"] == bundler_ruby_lib
       Bundler::SharedHelpers.set_env "RUBYLIB", rubylib.uniq.join(File::PATH_SEPARATOR)
     end
 
Index: ruby_2_6/version.h
===================================================================
--- ruby_2_6/version.h	(revision 67178)
+++ ruby_2_6/version.h	(revision 67179)
@@ -1,6 +1,6 @@ https://github.com/ruby/ruby/blob/trunk/ruby_2_6/version.h#L1
 #define RUBY_VERSION "2.6.1"
 #define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
-#define RUBY_PATCHLEVEL 36
+#define RUBY_PATCHLEVEL 37
 
 #define RUBY_RELEASE_YEAR 2019
 #define RUBY_RELEASE_MONTH 3
Index: ruby_2_6/spec/bundler/bundler/shared_helpers_spec.rb
===================================================================
--- ruby_2_6/spec/bundler/bundler/shared_helpers_spec.rb	(revision 67178)
+++ ruby_2_6/spec/bundler/bundler/shared_helpers_spec.rb	(revision 67179)
@@ -261,6 +261,15 @@ RSpec.describe Bundler::SharedHelpers do https://github.com/ruby/ruby/blob/trunk/ruby_2_6/spec/bundler/bundler/shared_helpers_spec.rb#L261
       subject.set_bundle_environment
     end
 
+    it "ignores if bundler_ruby_lib is same as rubylibdir" do
+      allow(Bundler::SharedHelpers).to receive(:bundler_ruby_lib).and_return(RbConfig::CONFIG["rubylibdir"])
+
+      subject.set_bundle_environment
+
+      paths = (ENV["RUBYLIB"]).split(File::PATH_SEPARATOR)
+      expect(paths.count(RbConfig::CONFIG["rubylibdir"])).to eq(0)
+    end
+
     it "exits if bundle path contains the unix-like path separator" do
       if Gem.respond_to?(:path_separator)
         allow(Gem).to receive(:path_separator).and_return(":")
Index: ruby_2_6
===================================================================
--- ruby_2_6	(revision 67178)
+++ ruby_2_6	(revision 67179)

Property changes on: ruby_2_6
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /trunk:r67006

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