[前][次][番号順一覧][スレッド一覧]

ruby-changes:37273

From: hsbt <ko1@a...>
Date: Tue, 20 Jan 2015 23:00:15 +0900 (JST)
Subject: [ruby-changes:37273] hsbt:r49354 (trunk): * tool/vcs.rb: fix the exception given remote-url of svn.

hsbt	2015-01-20 23:00:00 +0900 (Tue, 20 Jan 2015)

  New Revision: 49354

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=49354

  Log:
    * tool/vcs.rb: fix the exception given remote-url of svn.

  Modified files:
    trunk/ChangeLog
    trunk/tool/vcs.rb
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 49353)
+++ ChangeLog	(revision 49354)
@@ -1,3 +1,7 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Tue Jan 20 22:59:54 2015  SHIBATA Hiroshi  <shibata.hiroshi@g...>
+
+	* tool/vcs.rb: fix the exception given remote-url of svn.
+
 Tue Jan 20 12:58:33 2015  NAKAMURA Usaku  <usa@r...>
 
 	* tool/redmine-backporter.rb: now can change the page of `ls`.
Index: tool/vcs.rb
===================================================================
--- tool/vcs.rb	(revision 49353)
+++ tool/vcs.rb	(revision 49354)
@@ -161,13 +161,16 @@ class VCS https://github.com/ruby/ruby/blob/trunk/tool/vcs.rb#L161
         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

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]