diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | tool/vcs.rb | 15 |
2 files changed, 13 insertions, 6 deletions
@@ -1,3 +1,7 @@ +Tue Jan 20 22:59:54 2015 SHIBATA Hiroshi <shibata.hiroshi@gmail.com> + + * tool/vcs.rb: fix the exception given remote-url of svn. + Tue Jan 20 12:58:33 2015 NAKAMURA Usaku <usa@ruby-lang.org> * 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>(.*)<\/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 |