[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
dpranke at chromium.org
dpranke at chromium.org
Wed Dec 22 15:45:44 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit d83441c2c0617a5b97ba35a7750dac4b2cda61a6
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 11 22:52:39 2010 +0000
2010-11-11 Dirk Pranke <dpranke at chromium.org>
Reviewed by Eric Seidel.
fix missing 'pid' argument for http lockfile checking on win32
https://bugs.webkit.org/show_bug.cgi?id=49363
* Scripts/webkitpy/common/system/executive.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71854 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 19168d9..47c7ff4 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-11-11 Dirk Pranke <dpranke at chromium.org>
+
+ Reviewed by Eric Seidel.
+
+ fix missing 'pid' argument for http lockfile checking on win32
+ https://bugs.webkit.org/show_bug.cgi?id=49363
+
+ * Scripts/webkitpy/common/system/executive.py:
+
2010-11-11 Eric Seidel <eric at webkit.org>
Rubber-stamped by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/common/system/executive.py b/WebKitTools/Scripts/webkitpy/common/system/executive.py
index 37f4e53..85a683a 100644
--- a/WebKitTools/Scripts/webkitpy/common/system/executive.py
+++ b/WebKitTools/Scripts/webkitpy/common/system/executive.py
@@ -201,7 +201,7 @@ class Executive(object):
return
raise
- def _win32_check_running_pid(self):
+ def _win32_check_running_pid(self, pid):
class PROCESSENTRY32(ctypes.Structure):
_fields_ = [("dwSize", ctypes.c_ulong),
@@ -246,7 +246,7 @@ class Executive(object):
except OSError:
return False
elif sys.platform == 'win32':
- return self._win32_check_running_pid()
+ return self._win32_check_running_pid(pid)
assert(False)
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list