summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2015-01-09 00:26:45 -0800
committerAndre Arko <andre@arko.net>2015-01-09 00:26:45 -0800
commit88969b5210cbab4226cdcc4245762f8c3ba41f1a (patch)
tree138b7cbc228f8c1d52a26dbe01d7ca3c9dd21aa3
parente99a80e3bfdca3ac51e3d2c86bf3181ca0db3499 (diff)
downloadbundler-88969b5210cbab4226cdcc4245762f8c3ba41f1a.tar.gz
use gemfile over settings (not tested yet)
-rw-r--r--lib/bundler/fetcher.rb4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/bundler/fetcher.rb b/lib/bundler/fetcher.rb
index cf451d0572..7b92a436c2 100644
--- a/lib/bundler/fetcher.rb
+++ b/lib/bundler/fetcher.rb
@@ -379,10 +379,12 @@ module Bundler
def add_configured_credentials(uri)
auth = Bundler.settings[uri.to_s]
- if auth
+
+ if auth && uri.user.nil?
uri = uri.dup
uri.user, uri.password = *auth.split(":", 2)
end
+
AnonymizableURI.new(uri)
end