summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2019-10-29 16:57:16 +0100
committerHiroshi SHIBATA <hsbt@ruby-lang.org>2021-08-31 19:06:14 +0900
commit553ee573d45d4e81407266705c3006d31f92d73d (patch)
tree262971a5d3978f79f6ee8a8a43d326eedc7bbb5f
parent1663dd5f73c514343937cc018f5371dbffdeed99 (diff)
downloadruby-553ee573d45d4e81407266705c3006d31f92d73d.tar.gz
[rubygems/rubygems] Don't use gemdeps on bundler binstub
https://github.com/rubygems/rubygems/commit/320fdc1513
-rw-r--r--lib/rubygems/installer.rb13
1 files changed, 10 insertions, 3 deletions
diff --git a/lib/rubygems/installer.rb b/lib/rubygems/installer.rb
index b374b3fd65..6ab1f517d7 100644
--- a/lib/rubygems/installer.rb
+++ b/lib/rubygems/installer.rb
@@ -761,9 +761,7 @@ class Gem::Installer
#
require 'rubygems'
-
-Gem.use_gemdeps
-
+#{gemdeps_load(spec.name)}
version = "#{Gem::Requirement.default_prerelease}"
str = ARGV.first
@@ -784,6 +782,15 @@ end
TEXT
end
+ def gemdeps_load(name)
+ return '' if name == "bundler"
+
+ <<-TEXT
+
+Gem.use_gemdeps
+TEXT
+ end
+
##
# return the stub script text used to launch the true Ruby script