From 15f67872eeef59a13396505d4700317347e14b40 Mon Sep 17 00:00:00 2001 From: K Jonathan Harker Date: Tue, 11 Dec 2012 18:23:44 -0800 Subject: [PATCH] Prevent an uncaught exception from being rasied. An uncaught TypeError will be raised if auth_ref.management_url is None. Change-Id: I054aac24299c051afbc4497d56c6e286f5fa8616 Fixes: bug #1089188 --- keystoneclient/v2_0/client.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keystoneclient/v2_0/client.py b/keystoneclient/v2_0/client.py index 7ffaba681..e98f7a2c4 100644 --- a/keystoneclient/v2_0/client.py +++ b/keystoneclient/v2_0/client.py @@ -149,7 +149,7 @@ class Client(client.HTTPClient): # to determine what to do. Otherwise, load up the service catalog self.auth_token = self.auth_ref.auth_token if self.auth_ref.scoped: - if self.management_url is None: + if self.management_url is None and self.auth_ref.management_url: self.management_url = self.auth_ref.management_url[0] self.tenant_name = self.auth_ref.tenant_name self.tenant_id = self.auth_ref.tenant_id