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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 4a419eb16dd515138cfcc0c9fd7fc269c9add2d6
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Jan 23 00:12:12 2010 +0000

    2010-01-21  Joe Mason  <jmason at rim.com>
    
            Reviewed by Adam Barth.
    
            webkit-patch should retry on invalid password
            https://bugs.webkit.org/show_bug.cgi?id=33955
    
            Ask for bugs.webkit.org authentication in a loop.
    
            * Scripts/webkitpy/bugzilla.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53733 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 73c642b..762b208 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-01-21  Joe Mason  <jmason at rim.com>
+
+        Reviewed by Adam Barth.
+
+        webkit-patch should retry on invalid password
+        https://bugs.webkit.org/show_bug.cgi?id=33955
+
+        Ask for bugs.webkit.org authentication in a loop.
+
+        * Scripts/webkitpy/bugzilla.py:
+
 2010-01-22  Adam Barth  <abarth at webkit.org>
 
         Unreviewed.  Don't call seek on a NoneType.
diff --git a/WebKitTools/Scripts/webkitpy/bugzilla.py b/WebKitTools/Scripts/webkitpy/bugzilla.py
index 280773f..6c2295a 100644
--- a/WebKitTools/Scripts/webkitpy/bugzilla.py
+++ b/WebKitTools/Scripts/webkitpy/bugzilla.py
@@ -1,5 +1,6 @@
-# Copyright (c) 2009, Google Inc. All rights reserved.
+# Copyright (c) 2009 Google Inc. All rights reserved.
 # Copyright (c) 2009 Apple Inc. All rights reserved.
+# Copyright (c) 2010 Research In Motion Limited. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are
@@ -466,24 +467,25 @@ class Bugzilla(object):
             self.authenticated = True
             return
 
-        (username, password) = Credentials(
+        while not self.authenticated:
+            (username, password) = Credentials(
                 self.bug_server_host, git_prefix="bugzilla").read_credentials()
 
-        log("Logging in as %s..." % username)
-        self.browser.open(self.bug_server_url + "index.cgi?GoAheadAndLogIn=1")
-        self.browser.select_form(name="login")
-        self.browser['Bugzilla_login'] = username
-        self.browser['Bugzilla_password'] = password
-        response = self.browser.submit()
-
-        match = re.search("<title>(.+?)</title>", response.read())
-        # 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):
-            # FIXME: We could add the ability to try again on failure.
-            raise Exception("Bugzilla login failed: %s" % match.group(1))
-
-        self.authenticated = True
+            log("Logging in as %s..." % username)
+            self.browser.open(self.bug_server_url +
+                              "index.cgi?GoAheadAndLogIn=1")
+            self.browser.select_form(name="login")
+            self.browser['Bugzilla_login'] = username
+            self.browser['Bugzilla_password'] = password
+            response = self.browser.submit()
+
+            match = re.search("<title>(.+?)</title>", response.read())
+            # 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))
+            else:
+                self.authenticated = True
 
     def _fill_attachment_form(self,
                               description,

-- 
WebKit Debian packaging