summaryrefslogtreecommitdiff
path: root/lib/bundler/settings.rb
diff options
context:
space:
mode:
authorCarlhuda <carlhuda@engineyard.com>2010-07-12 14:08:58 -0700
committerCarlhuda <carlhuda@engineyard.com>2010-07-12 14:12:41 -0700
commit6f3b3fa2203a7a3aad0588d8c177ccc62dd684fa (patch)
tree5b6f88d70ead61f344a375f7ec9a751565458fbe /lib/bundler/settings.rb
parentd3101db631d844790522edaf2e515e47d0f5e1c0 (diff)
downloadbundler-6f3b3fa2203a7a3aad0588d8c177ccc62dd684fa.tar.gz
Fix a bug where BUNDLE_PATH was superceding a path set via "bundle install foo"
Diffstat (limited to 'lib/bundler/settings.rb')
-rw-r--r--lib/bundler/settings.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/bundler/settings.rb b/lib/bundler/settings.rb
index f8644d980a..b5cf0ab4e6 100644
--- a/lib/bundler/settings.rb
+++ b/lib/bundler/settings.rb
@@ -35,7 +35,7 @@ module Bundler
def path
path = ENV[key_for(:path)]
- return path if path
+ return path if path && !@config.key?(key_for(:path))
if path = self[:path]
"#{path}/#{Bundler.ruby_scope}"