Title: [92440] trunk/Tools
- Revision
- 92440
- Author
- [email protected]
- Date
- 2011-08-04 18:45:39 -0700 (Thu, 04 Aug 2011)
Log Message
Another speculative fix for the "svn revision on Windows" problem.
* Scripts/webkitpy/common/checkout/scm/git.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (92439 => 92440)
--- trunk/Tools/ChangeLog 2011-08-05 01:32:24 UTC (rev 92439)
+++ trunk/Tools/ChangeLog 2011-08-05 01:45:39 UTC (rev 92440)
@@ -1,3 +1,9 @@
+2011-08-04 Adam Barth <[email protected]>
+
+ Another speculative fix for the "svn revision on Windows" problem.
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+
2011-08-04 Mark Rowe <[email protected]>
Future-proof Xcode configuration settings.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (92439 => 92440)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2011-08-05 01:32:24 UTC (rev 92439)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2011-08-05 01:45:39 UTC (rev 92440)
@@ -99,8 +99,12 @@
@classmethod
def in_working_directory(cls, path):
- # FIXME: This should use an Executive.
- return run_command(['git', 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=Executive.ignore_error).rstrip() == "true"
+ try:
+ # FIXME: This should use an Executive.
+ return run_command(['git', 'rev-parse', '--is-inside-work-tree'], cwd=path, error_handler=Executive.ignore_error).rstrip() == "true"
+ except OSError, e:
+ # The Windows bots seem to through a WindowsError when git isn't installed.
+ return False
@classmethod
def find_checkout_root(cls, path):
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
