Title: [100423] trunk/Tools
- Revision
- 100423
- Author
- e...@webkit.org
- Date
- 2011-11-16 01:06:49 -0800 (Wed, 16 Nov 2011)
Log Message
check-webkit-style broken by r99773: "Could not determine the port"
https://bugs.webkit.org/show_bug.cgi?id=72275
Reviewed by Adam Barth.
I will continue engaging hacks, until windows improves.
* Scripts/webkitpy/common/host.py:
- Host uses self.executive instead of self._executive like Port does.
- I wanted to test this, but it mutates global state -- thus impossible to unittest at this time.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (100422 => 100423)
--- trunk/Tools/ChangeLog 2011-11-16 08:48:53 UTC (rev 100422)
+++ trunk/Tools/ChangeLog 2011-11-16 09:06:49 UTC (rev 100423)
@@ -5,6 +5,19 @@
Reviewed by Adam Barth.
+ I will continue engaging hacks, until windows improves.
+
+ * Scripts/webkitpy/common/host.py:
+ - Host uses self.executive instead of self._executive like Port does.
+ - I wanted to test this, but it mutates global state -- thus impossible to unittest at this time.
+
+2011-11-16 Eric Seidel <e...@webkit.org>
+
+ check-webkit-style broken by r99773: "Could not determine the port"
+ https://bugs.webkit.org/show_bug.cgi?id=72275
+
+ Reviewed by Adam Barth.
+
Engage windows hacks harder.
This is a speculative fix for ChromiumWin. We're now
Modified: trunk/Tools/Scripts/webkitpy/common/host.py (100422 => 100423)
--- trunk/Tools/Scripts/webkitpy/common/host.py 2011-11-16 08:48:53 UTC (rev 100422)
+++ trunk/Tools/Scripts/webkitpy/common/host.py 2011-11-16 09:06:49 UTC (rev 100423)
@@ -71,14 +71,13 @@
# FIXME: This is a horrible, horrible hack for ChromiumWin and should be removed.
# Maybe this belongs in SVN in some more generic "find the svn binary" codepath?
# Or possibly Executive should have a way to emulate shell path-lookups?
+ # FIXME: Unclear how to test this, since it currently mutates global state on SVN.
def _engage_awesome_windows_hacks(self):
- if sys.platform != "win32":
- return
try:
- self._executive.run_command(['svn', 'help'])
+ self.executive.run_command(['svn', 'help'])
except OSError, e:
try:
- self._executive.run_command(['svn.bat', 'help'])
+ self.executive.run_command(['svn.bat', 'help'])
# Chromium Win uses the depot_tools package, which contains a number
# of development tools, including Python and svn. Instead of using a
# real svn executable, depot_tools indirects via a batch file, called
@@ -96,7 +95,8 @@
_log.debug('Failed to engage svn.bat Windows hack.')
def _initialize_scm(self, patch_directories=None):
- self._engage_awesome_windows_hacks()
+ if sys.platform == "win32":
+ self._engage_awesome_windows_hacks()
self._scm = default_scm(patch_directories)
self._checkout = Checkout(self.scm())
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
