aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-06 08:40:02 +0000
committerusa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-06 08:40:02 +0000
commit3f1fc5e42b846f902a1dfc84766dd22b359b87c7 (patch)
treecb1bd81beb9a0664e5463a44bfe3e007b07a59f5
parent373a7006dd0555960a61cf9c1273de4a1e2a42d5 (diff)
downloadruby-3f1fc5e42b846f902a1dfc84766dd22b359b87c7.tar.gz
* tool/downloader.rb (RubyGems.download): follow the change of the
rubygems ssl_certs directory tree introduced by previous commit. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54502 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--tool/downloader.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 6abc562291..aae738bd3b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Wed Apr 6 17:38:42 2016 NAKAMURA Usaku <usa@ruby-lang.org>
+
+ * tool/downloader.rb (RubyGems.download): follow the change of the
+ rubygems ssl_certs directory tree introduced by previous commit.
+
Wed Apr 6 15:00:27 2016 SHIBATA Hiroshi <hsbt@ruby-lang.org>
* lib/rubygems.rb, lib/rubygems/*, test/rubygems/*: Update rubygems-2.6.3.
diff --git a/tool/downloader.rb b/tool/downloader.rb
index 5531eb2207..401a50f0c7 100644
--- a/tool/downloader.rb
+++ b/tool/downloader.rb
@@ -57,7 +57,7 @@ class Downloader
def self.download(name, dir = nil, since = true, options = {})
require 'rubygems'
require 'rubygems/package'
- options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/*.pem", File.dirname(__FILE__)))
+ options[:ssl_ca_cert] = Dir.glob(File.expand_path("../lib/rubygems/ssl_certs/**/*.pem", File.dirname(__FILE__)))
file = under(dir, name)
super("https://rubygems.org/downloads/#{name}", file, nil, since, options) or
return false