[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
eric at webkit.org
eric at webkit.org
Wed Jan 6 00:11:02 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 5f093896831cd61efd603686a563a5e567d6e1db
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 30 04:12:07 2009 +0000
2009-12-29 Adam Barth <abarth at webkit.org>
Reviewed by Eric Seidel.
[bzt] post-diff requires reading to the end
https://bugs.webkit.org/show_bug.cgi?id=33036
Catch the IOError caused by not reading to the end of the diff. We
don't have a good way to test this currently.
* Scripts/modules/user.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52639 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 65d4c02..0112508 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-29 Adam Barth <abarth at webkit.org>
+
+ Reviewed by Eric Seidel.
+
+ [bzt] post-diff requires reading to the end
+ https://bugs.webkit.org/show_bug.cgi?id=33036
+
+ Catch the IOError caused by not reading to the end of the diff. We
+ don't have a good way to test this currently.
+
+ * Scripts/modules/user.py:
+
2009-12-29 Chang Shu <Chang.Shu at nokia.com>
Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/user.py b/WebKitTools/Scripts/modules/user.py
index 8b72673..6be8905 100644
--- a/WebKitTools/Scripts/modules/user.py
+++ b/WebKitTools/Scripts/modules/user.py
@@ -39,8 +39,11 @@ class User(object):
def page(self, message):
pager = os.environ.get("PAGER") or "less"
- child_process = subprocess.Popen([pager], stdin=subprocess.PIPE)
- child_process.communicate(input=message)
+ try:
+ child_process = subprocess.Popen([pager], stdin=subprocess.PIPE)
+ child_process.communicate(input=message)
+ except IOError, e:
+ pass
def confirm(self):
response = raw_input("\nContinue? [Y/n]: ")
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list