summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-01 08:29:36 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-04-01 08:29:36 +0000
commit0b57f67531a1dc722524a5316657ffb9c783b108 (patch)
tree970714b8884828ca9bcf9b5302facf638a3f83fb /tool
parent99d1f5f88b9b6de3124e31019902f91e030d334f (diff)
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
Diffstat (limited to 'tool')
-rw-r--r--tool/config_files.rb7
-rwxr-xr-xtool/get-config_files9
2 files changed, 12 insertions, 4 deletions
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
}