Permalink
Browse files

lib/bundler/settings.rb: Only make config consistent, ENV is exceptional

  • Loading branch information...
1 parent 5e6b20e commit 841881f0bb877cdf4cde53b06f79bd6a5ad56381 @godfat godfat committed Sep 1, 2012
Showing with 3 additions and 3 deletions.
  1. +3 −3 lib/bundler/settings.rb
View
@@ -84,10 +84,10 @@ def without
# @local_config["BUNDLE_PATH"] should be prioritized over ENV["BUNDLE_PATH"]
def path
key = key_for(:path)
- path = ENV[key] || @global_config[key]
- return "#{path}/#{Bundler.ruby_scope}" if path && !@local_config.key?(key)
+ path = ENV[key]
+ return path if path && !@local_config.key?(key)
- if path = self[:path]
+ if path = self[:path] || @global_config[key]
"#{path}/#{Bundler.ruby_scope}"
else
Bundler.rubygems.gem_dir

0 comments on commit 841881f

Please sign in to comment.