summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-20 14:00:00 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-01-20 14:00:00 +0000
commit6c68a3edfa7d26ea8ebcc19cb019bc85485d5705 (patch)
treebb5f0e4ad5ce081fd4e6e0f74cd4c903fdb60787 /tool
parent76d0574181153cf243c42d19442baec0dc030370 (diff)
* 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
Diffstat (limited to 'tool')
-rw-r--r--tool/vcs.rb15
1 files changed, 9 insertions, 6 deletions
diff --git a/tool/vcs.rb b/tool/vcs.rb
index 1f4f5ff..72201a5 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -161,13 +161,16 @@ class VCS
info = get_info
@wcroot = info[/<wcroot-abspath>(.*)<\/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