Handle svn 1.7 when detecting whether a directory is in an svn checkout.

https://bugs.webkit.org/show_bug.cgi?id=72349

Patch by Peter Kasting <pkasting@google.com> on 2011-11-15
Reviewed by Adam Roben.

* Scripts/VCSUtils.pm:
(isSVNDirectory):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@100286 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 5dfb4a911d8669090d108473853c9f7dc41ac9b0..985aaac5e1a33bcd2e5954152d2f89b9a62ffe44 100644 (file)
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2011-11-15  Peter Kasting  <pkasting@google.com>
+
+        Handle svn 1.7 when detecting whether a directory is in an svn checkout.
+        https://bugs.webkit.org/show_bug.cgi?id=72349
+
+        Reviewed by Adam Roben.
+
+        * Scripts/VCSUtils.pm:
+        (isSVNDirectory):
+
 2011-11-15  Simon Hausmann  <simon.hausmann@nokia.com>
 
         [Qt] Centralize hide_symbols and ensure all libs are built with symbol visibility & bsymbolic_functions

diff --git a/Tools/Scripts/VCSUtils.pm b/Tools/Scripts/VCSUtils.pm
index 51bf2dc30634832444b436f9f3ec191ddf2231dd..b2848220d4e2068b40ef3f303cb357b4597e9132 100644 (file)
--- a/Tools/Scripts/VCSUtils.pm
+++ b/Tools/Scripts/VCSUtils.pm
@@ -249,8 +249,7 @@ sub isGitBranchBuild()
 sub isSVNDirectory($)
 {
     my ($dir) = @_;
-
-    return -d File::Spec->catdir($dir, ".svn");
+    return system("cd $dir && svn info > " . File::Spec->devnull() . " 2>&1") == 0;
 }
 
 sub isSVN()