[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7ca60d100ab9ef1c7638f6760eb777fe1ba1cc96
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 28 08:12:32 2010 +0000

    2010-01-28  Joe Mason  <jmason at rim.com>
    
            Reviewed by Adam Barth.
    
            Limit login retries to 5
            https://bugs.webkit.org/show_bug.cgi?id=34193
    
            * Scripts/webkitpy/bugzilla.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53976 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6fbdac3..6cc26f3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-28  Joe Mason  <jmason at rim.com>
+
+        Reviewed by Adam Barth.
+
+        Limit login retries to 5
+        https://bugs.webkit.org/show_bug.cgi?id=34193
+
+        * Scripts/webkitpy/bugzilla.py:
+
 2010-01-27  Martin Robinson  <mrobinson at webkit.org>
 
         Adding myself to the committer list. No review necessary.
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index 6c2295a..c1cf41d 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -467,7 +467,9 @@ class Bugzilla(object):
             self.authenticated = True
             return
 
+        attempts = 0
         while not self.authenticated:
+            attempts += 1
             (username, password) = Credentials(
                 self.bug_server_host, git_prefix="bugzilla").read_credentials()
 
@@ -483,7 +485,12 @@ class Bugzilla(object):
             # If the resulting page has a title, and it contains the word
             # "invalid" assume it's the login failure page.
             if match and re.search("Invalid", match.group(1), re.IGNORECASE):
-                log("Bugzilla login failed: %s" % match.group(1))
+                errorMessage = "Bugzilla login failed: %s" % match.group(1)
+                # raise an exception only if this was the last attempt
+                if attempts < 5:
+                    log(errorMessage)
+                else:
+                    raise Exception(errorMessage)
             else:
                 self.authenticated = True
 

-- 
WebKit Debian packaging