summaryrefslogtreecommitdiff
path: root/lib/bundler/mirror.rb
diff options
context:
space:
mode:
authorMichael Peters <mtpeters@us.ibm.com>2016-08-09 14:01:56 -0400
committerMichael Peters <mtpeters@us.ibm.com>2016-08-09 14:01:56 -0400
commit43833ec33cf686e9bfa9bae3a98b6bdda815149d (patch)
tree2dfc8a8f6101767f3b3514322dfbf8cc9738165d /lib/bundler/mirror.rb
parent4b249e66f4d0de32762fd41a6466d28848f60946 (diff)
downloadbundler-43833ec33cf686e9bfa9bae3a98b6bdda815149d.tar.gz
doesn't change the way existing source URLs are validated
Diffstat (limited to 'lib/bundler/mirror.rb')
-rw-r--r--lib/bundler/mirror.rb5
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/bundler/mirror.rb b/lib/bundler/mirror.rb
index 7d872966ee..0072fd8a7f 100644
--- a/lib/bundler/mirror.rb
+++ b/lib/bundler/mirror.rb
@@ -43,8 +43,7 @@ module Bundler
private
def fetch_valid_mirror_for(uri)
- host = Settings.normalize_uri(URI(uri.to_s).host)
- mirror = (@mirrors[URI(uri.to_s.downcase)] || @mirrors[host] || Mirror.new(uri)).validate!(@prober)
+ mirror = (@mirrors[URI(uri.to_s.downcase)] || @mirrors[URI(uri.to_s).host] || Mirror.new(uri)).validate!(@prober)
mirror = Mirror.new(uri) unless mirror.valid?
mirror
end
@@ -122,7 +121,7 @@ module Bundler
if uri == "all"
@all = true
else
- @uri = Settings.normalize_uri(uri)
+ @uri = /https?:/ =~ uri ? Settings.normalize_uri(uri) : uri
end
@value = value
end