From 69ee28e6c98205e604bf2371dcbd2dd17ac57011 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Thu, 12 Aug 2010 15:08:40 -0700 Subject: [PATCH 1/3] Add support for installing any type of file within client/WEB-INF --- wscript_build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/wscript_build b/wscript_build index 59e33345f80..a964c9040dd 100644 --- a/wscript_build +++ b/wscript_build @@ -460,7 +460,10 @@ if buildpremium: bld.install_files('${SYSCONFDIR}/%s/%s'%(bld.env.PACKAGE,proj),'cloudstack-proprietary/test/conf/*') # build / install declarations of server project <- this is actually now in client project -bld.install_files("${MSENVIRON}/webapps/client/WEB-INF",'client/WEB-INF/web.xml') # install web.xml file +start_path = bld.path.find_dir("client/WEB-INF") +bld.install_files('${MSENVIRON}/webapps/client/WEB-INF', + start_path.ant_glob("**",src=True,bld=False,dir=False,flat=True), + cwd=start_path,relative_trick=True) if not Options.options.PRESERVECONFIG: bld.install_files_filtered("${SERVERSYSCONFDIR}","server/conf/*") From b97899b2cfc5d1b1aea21b50da4b732770abdd55 Mon Sep 17 00:00:00 2001 From: "Manuel Amador (Rudd-O)" Date: Thu, 12 Aug 2010 15:21:51 -0700 Subject: [PATCH 2/3] Correct indentationerror in python --- python/lib/cloud_utils.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/lib/cloud_utils.py b/python/lib/cloud_utils.py index f638c55f6f8..b028838d1ed 100644 --- a/python/lib/cloud_utils.py +++ b/python/lib/cloud_utils.py @@ -939,7 +939,7 @@ def setup_agent_config(configfile, host, zone, pod): stderr("You selected zone %s pod %s",confopts["zone"],confopts["pod"]) else: stderr("Skipped -- using the previous zone %s pod %s",confopts["zone"],confopts["pod"]) - else: + else: confopts["zone"] = zone confopts["pod"] = pod except (urllib2.URLError,urllib2.HTTPError),e: 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 3/3] 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])