bug 5876: Fix error reporting in agent setup so it will not cause a nested exception

Rudd-O · Rudd-O · commit a2cf253b20a9 · 2010-08-12T15:22:34.000-07:00
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
diff --git 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])
