From 0b57f67531a1dc722524a5316657ffb9c783b108 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 1 Apr 2014 08:29:36 +0000 Subject: config_files.rb: show failure * tool/config_files.rb (ConfigFiles.download): show failed URI. [ruby-core:61792] [Bug #9690] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@45494 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ tool/config_files.rb | 7 +++++-- tool/get-config_files | 9 +++++++-- 3 files changed, 17 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 14fea65532..4cae32d96d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Tue Apr 1 17:29:35 2014 Nobuyoshi Nakada + + * tool/config_files.rb (ConfigFiles.download): show failed URI. + [ruby-core:61792] [Bug #9690] + Tue Apr 1 12:06:49 2014 NARUSE, Yui * 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 } -- cgit v1.2.3