diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | tool/config_files.rb | 7 | ||||
-rwxr-xr-x | tool/get-config_files | 9 |
3 files changed, 17 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Apr 1 17:29:35 2014 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * tool/config_files.rb (ConfigFiles.download): show failed URI. + [ruby-core:61792] [Bug #9690] + Tue Apr 1 12:06:49 2014 NARUSE, Yui <naruse@ruby-lang.org> * addr2line.c (rb_dump_backtrace_with_lines): don't depend hard coded diff --git a/tool/config_files.rb b/tool/config_files.rb index 676c355e05..24c5989d97 100644 --- a/tool/config_files.rb +++ b/tool/config_files.rb @@ -1,8 +1,11 @@ require 'open-uri' -ConfigFiles = "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD" +ConfigFiles = "http://git0.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=%s;hb=HEAD" def ConfigFiles.download(name, dir = nil) - data = URI(self % name).read + uri = URI(self % name) + data = uri.read file = dir ? File.join(dir, name) : name open(file, "wb", 0755) {|f| f.write(data)} +rescue => e + raise "failed to download #{name}\n#{e.message}: #{uri}" end diff --git a/tool/get-config_files b/tool/get-config_files index 4551694180..7828dade99 100755 --- a/tool/get-config_files +++ b/tool/get-config_files @@ -2,6 +2,11 @@ require File.expand_path('../config_files', __FILE__) ARGV.each {|n| STDOUT.print "Downloading #{n}..."; STDOUT.flush - ConfigFiles.download(n) - STDOUT.puts + begin + ConfigFiles.download(n) + STDOUT.puts + rescue => e + STDOUT.puts + abort("#{$0}: #{e.message}") + end } |