[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7b3c121a9a195df65318e09d93670f5868e96002
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 7 10:22:40 2010 +0000

    2010-01-07  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Maciej Stachowiak.
    
            Don't print a redundant message when confirming a diff
            https://bugs.webkit.org/show_bug.cgi?id=33315
    
            Instead of saying "ERROR: User declined" we should just exit because
            the use knows they just declined!
    
            * Scripts/webkitpy/steps/confirmdiff.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52912 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a411fb5..d3fc16f 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Maciej Stachowiak.
 
+        Don't print a redundant message when confirming a diff
+        https://bugs.webkit.org/show_bug.cgi?id=33315
+
+        Instead of saying "ERROR: User declined" we should just exit because
+        the use knows they just declined!
+
+        * Scripts/webkitpy/steps/confirmdiff.py:
+
+2010-01-07  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Maciej Stachowiak.
+
         Check style before uploading a patch
         https://bugs.webkit.org/show_bug.cgi?id=33314
 
diff --git a/WebKitTools/Scripts/webkitpy/steps/confirmdiff.py b/WebKitTools/Scripts/webkitpy/steps/confirmdiff.py
index 1129902..fc28f8f 100644
--- a/WebKitTools/Scripts/webkitpy/steps/confirmdiff.py
+++ b/WebKitTools/Scripts/webkitpy/steps/confirmdiff.py
@@ -44,4 +44,4 @@ class ConfirmDiff(AbstractStep):
         diff = self.cached_lookup(state, "diff")
         self._tool.user.page(diff)
         if not self._tool.user.confirm("Was that diff correct?"):
-            error("User declined to continue.")
+            exit(1)

-- 
WebKit Debian packaging