summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorThe Bundler Bot <bot@bundler.io>2017-08-12 01:00:51 +0000
committerThe Bundler Bot <bot@bundler.io>2017-08-12 01:00:51 +0000
commit716b3aab28cb51071f6a598beed7c8b98e876e68 (patch)
treec5b30dbc1340c1dc37c213b8ae26387b47dc6305 /lib
parentc14d59a29739ea1a4bb73f664fc6620a711250b0 (diff)
parent2e433c84817cebe424dcd90bd1b906df54bc83f3 (diff)
downloadbundler-716b3aab28cb51071f6a598beed7c8b98e876e68.tar.gz
Auto merge of #5912 - koic:dont_create_gem_home_before_setting_it, r=segiddins
[2.0] Don't create gem home before setting it ### What was the end-user problem that led to this PR? (Follow up of #2884) It seems that [the PR](#2884) written in [Bundler 2 RFC](https://github.com/bundler/rfcs/pull/6/files#diff-0579edc0374571613cd01f0a42c19bdaR30) is not included in master. ### What was your diagnosis of the problem? It applies to master branch based on the PR implementation written in RFC. ### What is your fix for the problem, implemented in this PR? This PR will switch `Bundler.feature_flag` using `bundler_2_mode`. ### Why did you choose this fix out of the possible options? Since #2884 does not use `Bundler.feature_flag`, then compatibility with Bundler 1 will be lost.
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler.rb7
1 files changed, 0 insertions, 7 deletions
diff --git a/lib/bundler.rb b/lib/bundler.rb
index 5eb2d1bca4..2da2db29c9 100644
--- a/lib/bundler.rb
+++ b/lib/bundler.rb
@@ -524,13 +524,6 @@ EOF
end
def configure_gem_home
- # TODO: This mkdir_p is only needed for JRuby <= 1.5 and should go away (GH #602)
- begin
- FileUtils.mkdir_p bundle_path.to_s
- rescue
- nil
- end
-
Bundler::SharedHelpers.set_env "GEM_HOME", File.expand_path(bundle_path, root)
Bundler.rubygems.clear_paths
end