summaryrefslogtreecommitdiff
path: root/lib/bundler
diff options
context:
space:
mode:
authorDavid Rodríguez <deivid.rodriguez@riseup.net>2022-05-27 20:46:42 +0200
committergit <svn-admin@ruby-lang.org>2022-05-30 17:42:39 +0900
commitea31c5bcd1bc1a019a6aee2b3f3b16813d7ff96d (patch)
tree9a1ef608de38fbfa75e47adfa5264105ae13fd30 /lib/bundler
parent0d7d8f3777b4521b2e83d81c0f830941bfba7b9c (diff)
[rubygems/rubygems] Fix crash when installing gems with symlinks
If BUNDLE_PATH is configured to a symlinked path, installing gems with symlinks would crash with an error like this: ``` Gem::Package::SymlinkError: installing symlink 'man/man0/README.markdown' pointing to parent path /usr/home/stevewi/srv/mail/lib/tools/.vendor/ruby/3.1.0/gems/binman-5.1.0/README.markdown of /srv/mail/lib/tools/.vendor/ruby/3.1.0/gems/binman-5.1.0 is not allowed ``` This commit fixes the problem by changing the bundle path to be the realpath of the configured value, right after we're sure the path has been created. https://github.com/rubygems/rubygems/commit/3cd3dd142a
Diffstat (limited to 'lib/bundler')
-rw-r--r--lib/bundler/inline.rb1
-rw-r--r--lib/bundler/installer.rb11
-rw-r--r--lib/bundler/source/rubygems.rb2
3 files changed, 3 insertions, 11 deletions
diff --git a/lib/bundler/inline.rb b/lib/bundler/inline.rb
index db1ca2de65..8ef580f1f0 100644
--- a/lib/bundler/inline.rb
+++ b/lib/bundler/inline.rb
@@ -38,6 +38,7 @@ def gemfile(install = false, options = {}, &gemfile)
raise ArgumentError, "Unknown options: #{opts.keys.join(", ")}" unless opts.empty?
begin
+ Bundler.instance_variable_set(:@bundle_path, Pathname.new(Gem.dir))
old_gemfile = ENV["BUNDLE_GEMFILE"]
Bundler::SharedHelpers.set_env "BUNDLE_GEMFILE", "Gemfile"
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 915a04c0dc..f195d36600 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -66,7 +66,7 @@ module Bundler
# require paths and save them in a `setup.rb` file. See `bundle standalone --help` for more
# information.
def run(options)
- create_bundle_path
+ Bundler.create_bundle_path
ProcessLock.lock do
if Bundler.frozen_bundle?
@@ -262,15 +262,6 @@ module Bundler
end
end
- def create_bundle_path
- SharedHelpers.filesystem_access(Bundler.bundle_path.to_s) do |p|
- Bundler.mkdir_p(p)
- end unless Bundler.bundle_path.exist?
- rescue Errno::EEXIST
- raise PathError, "Could not install to path `#{Bundler.bundle_path}` " \
- "because a file already exists at that path. Either remove or rename the file so the directory can be created."
- end
-
# returns whether or not a re-resolve was needed
def resolve_if_needed(options)
if !@definition.unlocking? && !options["force"] && !Bundler.settings[:inline] && Bundler.default_lockfile.file?
diff --git a/lib/bundler/source/rubygems.rb b/lib/bundler/source/rubygems.rb
index b37bfbccb9..5dceacbae4 100644
--- a/lib/bundler/source/rubygems.rb
+++ b/lib/bundler/source/rubygems.rb
@@ -499,7 +499,7 @@ module Bundler
end
def rubygems_dir
- Bundler.rubygems.gem_dir
+ Bundler.bundle_path
end
def default_cache_path_for(dir)