Title: [124343] trunk/Tools
- Revision
- 124343
- Author
- [email protected]
- Date
- 2012-08-01 10:48:08 -0700 (Wed, 01 Aug 2012)
Log Message
keyring.get_password may raise an exception.
https://bugs.webkit.org/show_bug.cgi?id=92876
Patch by Arnaud Renevier <[email protected]> on 2012-08-01
Reviewed by Dirk Pranke.
keyring.get_password sometimes raises an exception. We wrap this call,
and also set_password to avoid breaking webkit-patch in that case.
* Scripts/webkitpy/common/net/credentials.py:
(Credentials._offer_to_store_credentials_in_keyring):
(Credentials.read_credentials):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (124342 => 124343)
--- trunk/Tools/ChangeLog 2012-08-01 17:43:13 UTC (rev 124342)
+++ trunk/Tools/ChangeLog 2012-08-01 17:48:08 UTC (rev 124343)
@@ -1,3 +1,17 @@
+2012-08-01 Arnaud Renevier <[email protected]>
+
+ keyring.get_password may raise an exception.
+ https://bugs.webkit.org/show_bug.cgi?id=92876
+
+ Reviewed by Dirk Pranke.
+
+ keyring.get_password sometimes raises an exception. We wrap this call,
+ and also set_password to avoid breaking webkit-patch in that case.
+
+ * Scripts/webkitpy/common/net/credentials.py:
+ (Credentials._offer_to_store_credentials_in_keyring):
+ (Credentials.read_credentials):
+
2012-08-01 Xianzhu Wang <[email protected]>
Layout Test fast/text/descent-clip-in-scaled-page.html is failing on linux since it was added
Modified: trunk/Tools/Scripts/webkitpy/common/net/credentials.py (124342 => 124343)
--- trunk/Tools/Scripts/webkitpy/common/net/credentials.py 2012-08-01 17:43:13 UTC (rev 124342)
+++ trunk/Tools/Scripts/webkitpy/common/net/credentials.py 2012-08-01 17:48:08 UTC (rev 124343)
@@ -131,7 +131,10 @@
return
if not User().confirm("Store password in system keyring?", User.DEFAULT_NO):
return
- self._keyring.set_password(self.host, username, password)
+ try:
+ self._keyring.set_password(self.host, username, password)
+ except:
+ pass
def read_credentials(self, user=User):
username, password = self._credentials_from_environment()
@@ -146,7 +149,10 @@
username = user.prompt("%s login: " % self.host)
if username and not password and self._keyring:
- password = self._keyring.get_password(self.host, username)
+ try:
+ password = self._keyring.get_password(self.host, username)
+ except:
+ pass
if not password:
password = user.prompt_password("%s password for %s: " % (self.host, username))
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
