Title: [91001] trunk/Tools
- Revision
- 91001
- Author
- [email protected]
- Date
- 2011-07-14 09:00:43 -0700 (Thu, 14 Jul 2011)
Log Message
Fix Python exception blocking the commit-queue.
* Scripts/webkitpy/common/checkout/scm/git.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91000 => 91001)
--- trunk/Tools/ChangeLog 2011-07-14 14:47:43 UTC (rev 91000)
+++ trunk/Tools/ChangeLog 2011-07-14 16:00:43 UTC (rev 91001)
@@ -1,3 +1,9 @@
+2011-07-14 Adam Barth <[email protected]>
+
+ Fix Python exception blocking the commit-queue.
+
+ * Scripts/webkitpy/common/checkout/scm/git.py:
+
2011-07-13 Eric Seidel <[email protected]>
Move webkitpy off of loose mocks
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py (91000 => 91001)
--- trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2011-07-14 14:47:43 UTC (rev 91000)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/scm/git.py 2011-07-14 16:00:43 UTC (rev 91001)
@@ -131,7 +131,7 @@
return self.run(['git', 'log', '--pretty=oneline', 'HEAD...' + self.remote_branch_ref()], cwd=self.checkout_root).splitlines()
def rebase_in_progress(self):
- return self._filesystem.exists(self.absolute_path('.git', 'rebase-apply'))
+ return self._filesystem.exists(self.absolute_path(self._filesystem.join('.git', 'rebase-apply')))
def working_directory_is_clean(self):
return self.run(['git', 'diff', 'HEAD', '--name-only'], cwd=self.checkout_root) == ""
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
