[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

abarth at webkit.org abarth at webkit.org
Mon Feb 21 00:32:43 UTC 2011


The following commit has been merged in the webkit-1.3 branch:
commit 6e6cf2b3240e0164b0420f892a8f55c509ea58e0
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Feb 1 20:35:41 2011 +0000

    2011-02-01  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Mihai Parparita.
    
            Using Control-C to cancel webkit-patch or other python tools causes
            unpleasant traceback console spew
            https://bugs.webkit.org/show_bug.cgi?id=53462
    
            Catch the exception and don't print the stack trace.
    
            * Scripts/webkit-patch:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77275 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 547caf7..ef749ce 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,15 @@
+2011-02-01  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Mihai Parparita.
+
+        Using Control-C to cancel webkit-patch or other python tools causes
+        unpleasant traceback console spew
+        https://bugs.webkit.org/show_bug.cgi?id=53462
+
+        Catch the exception and don't print the stack trace.
+
+        * Scripts/webkit-patch:
+
 2011-02-01  Scott Cameron  <sccameron at rim.com>
 
         Reviewed by Daniel Bates.
diff --git a/Tools/Scripts/webkit-patch b/Tools/Scripts/webkit-patch
index 007f919..1eb8476 100755
--- a/Tools/Scripts/webkit-patch
+++ b/Tools/Scripts/webkit-patch
@@ -33,6 +33,7 @@
 
 import logging
 import os
+import signal
 import sys
 
 from webkitpy.common.system.logutils import configure_logging
@@ -66,5 +67,7 @@ def main():
 
 
 if __name__ == "__main__":
-
-    main()
+    try:
+        main()
+    except KeyboardInterrupt:
+        sys.exit(signal.SIGINT + 128)

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list