From 6c68a3edfa7d26ea8ebcc19cb019bc85485d5705 Mon Sep 17 00:00:00 2001 From: hsbt Date: Tue, 20 Jan 2015 14:00:00 +0000 Subject: [PATCH] * tool/vcs.rb: fix the exception given remote-url of svn. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49354 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ tool/vcs.rb | 15 +++++++++------ 2 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index abeea1355f..433b31ce03 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Tue Jan 20 22:59:54 2015 SHIBATA Hiroshi + + * tool/vcs.rb: fix the exception given remote-url of svn. + Tue Jan 20 12:58:33 2015 NAKAMURA Usaku * tool/redmine-backporter.rb: now can change the page of `ls`. diff --git a/tool/vcs.rb b/tool/vcs.rb index 1f4f5ff0e0..72201a598d 100644 --- a/tool/vcs.rb +++ b/tool/vcs.rb @@ -161,13 +161,16 @@ class VCS info = get_info @wcroot = info[/(.*)<\/wcroot-abspath>/, 1] unless @wcroot - parent = File.realpath(@srcdir) begin - parent = File.dirname(wkdir = parent) - if File.directory?(wkdir + "/.svn") - break @wcroot = wkdir - end - end until parent == wkdir + parent = File.realpath(@srcdir) + begin + parent = File.dirname(wkdir = parent) + if File.directory?(wkdir + "/.svn") + break @wcroot = wkdir + end + end until parent == wkdir + rescue TypeError + end end end @wcroot