From a2cf253b20a98ec7ba160a4d682df9cd79ed39d7 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Thu, 12 Aug 2010 15:22:34 -0700 Subject: [PATCH] bug 5876: Fix error reporting in agent setup so it will not cause a nested exception The function stderr was being called with the wrong name of interpolation parameters. The exception was missing from the arguments to the function. status 5876: resolved fixed --- python/lib/cloud_utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py index b028838d1ed..6df111c58c6 100644 --- a/python/lib/cloud_utils.py +++ b/python/lib/cloud_utils.py @@ -943,7 +943,7 @@ def setup_agent_config(configfile, host, zone, pod): confopts["zone"] = zone confopts["pod"] = pod except (urllib2.URLError,urllib2.HTTPError),e: - stderr("Query failed: %s. Defaulting to zone %s pod %s",confopts["zone"],confopts["pod"]) + stderr("Query failed: %s. Defaulting to zone %s pod %s",str(e),confopts["zone"],confopts["pod"]) for opt,val in confopts.items(): line = "=".join([opt,val]) @@ -988,7 +988,7 @@ def setup_consoleproxy_config(configfile, host, zone, pod): confopts["zone"] = zone confopts["pod"] = pod except (urllib2.URLError,urllib2.HTTPError),e: - stderr("Query failed: %s. Defaulting to zone %s pod %s",e,confopts["zone"],confopts["pod"]) + stderr("Query failed: %s. Defaulting to zone %s pod %s",str(e),confopts["zone"],confopts["pod"]) for opt,val in confopts.items(): line = "=".join([opt,val])