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

[aroben at apple.com]

The following commit has been merged in the webkit-1.2 branch:
commit 05d206c86844ebf0b3ba998bb1fb2f31d409c845
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Nov 5 16:42:45 2009 +0000

    Remove bogus else clause in bugzilla-tool
    
    Fixes <http://webkit.org/b/31125> REGRESSION (r47121): bugzilla-tool
    create-bug raises exception after entering bug description
    
    Reviewed by David Kilzer.
    
    * Scripts/bugzilla-tool:
    (CreateBug): else clauses are only hit if no exception is raised, so
    it makes no sense to try to re-raise the exception in an else clause.
    The exception will automatically be re-raised if it doesn't match any
    of the except clauses, so we don't have to do anything special here at
    all to get the desired behavior.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@50565 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index fc877ed..d2715ef 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,19 @@
+2009-11-04  Adam Roben  <aroben at apple.com>
+
+        Remove bogus else clause in bugzilla-tool
+
+        Fixes <http://webkit.org/b/31125> REGRESSION (r47121): bugzilla-tool
+        create-bug raises exception after entering bug description
+
+        Reviewed by David Kilzer.
+
+        * Scripts/bugzilla-tool:
+        (CreateBug): else clauses are only hit if no exception is raised, so
+        it makes no sense to try to re-raise the exception in an else clause.
+        The exception will automatically be re-raised if it doesn't match any
+        of the except clauses, so we don't have to do anything special here at
+        all to get the desired behavior.
+
 2009-11-04  Eric Seidel  <eric at webkit.org>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/Scripts/bugzilla-tool b/WebKitTools/Scripts/bugzilla-tool
index e17abbe..fb19247 100755
--- a/WebKitTools/Scripts/bugzilla-tool
+++ b/WebKitTools/Scripts/bugzilla-tool
@@ -624,8 +624,6 @@ class CreateBug(Command):
             # FIXME: Figure out a way to get avoid the exception in the first
             # place.
             pass
-        else:
-            raise
         comment_text = ''.join(lines)
         return (bug_title, comment_text)
 

-- 
WebKit Debian packaging