[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
dbates at webkit.org
dbates at webkit.org
Wed Jan 6 00:16:58 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 9c32a209300108510e51990dcc4d75f7cbe4ebd9
Author: dbates at webkit.org <dbates at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 4 08:40:11 2010 +0000
2010-01-04 Daniel Bates <dbates at webkit.org>
https://bugs.webkit.org/show_bug.cgi?id=33039
Unreviewed fix.
* Scripts/webkitpy/credentials.py:
* Scripts/webkitpy/credentials_unittest.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52712 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b1950a4..5535185 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
2010-01-04 Daniel Bates <dbates at webkit.org>
+ https://bugs.webkit.org/show_bug.cgi?id=33039
+
+ Unreviewed fix.
+
+ * Scripts/webkitpy/credentials.py:
+ * Scripts/webkitpy/credentials_unittest.py:
+
+2010-01-04 Daniel Bates <dbates at webkit.org>
+
Reviewed by Eric Seidel.
https://bugs.webkit.org/show_bug.cgi?id=33039
diff --git a/WebKitTools/Scripts/webkitpy/credentials.py b/WebKitTools/Scripts/webkitpy/credentials.py
index de74ba7..7927095 100644
--- a/WebKitTools/Scripts/webkitpy/credentials.py
+++ b/WebKitTools/Scripts/webkitpy/credentials.py
@@ -77,14 +77,17 @@ class Credentials(object):
# Failed to either find a keychain entry or somekind of OS-related error
# occured (for instance, couldn't find the /usr/sbin/security command).
log("Could not find a keychain entry for %s." % self.host)
- return [None, None]
+ return None
def _credentials_from_keychain(self, username=None):
if not self._is_mac_os_x():
return [username, None]
security_output = self._run_security_tool(username)
- return self._parse_security_tool_output(security_output)
+ if security_output:
+ return self._parse_security_tool_output(security_output)
+ else:
+ return [None, None]
def read_credentials(self):
username = None
diff --git a/WebKitTools/Scripts/webkitpy/credentials_unittest.py b/WebKitTools/Scripts/webkitpy/credentials_unittest.py
index bdf5142..0bd5340 100644
--- a/WebKitTools/Scripts/webkitpy/credentials_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/credentials_unittest.py
@@ -82,7 +82,7 @@ password: "SECRETSAUCE"
# by the test case CredentialsTest._assert_security_call (below).
outputCapture = OutputCapture()
outputCapture.capture_output()
- self.assertEqual(credentials._run_security_tool(), [None, None])
+ self.assertEqual(credentials._run_security_tool(), None)
outputCapture.restore_output()
def _assert_security_call(self, username=None):
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list