From 350c08530cd1a9a6105c29be0f359198db3714a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tino=20V=C3=A1zquez?= Date: Wed, 12 Jan 2011 16:02:00 +0100 Subject: [PATCH 1/2] Fix for wrong user in image creation --- src/cloud/occi/lib/OCCIServer.rb | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/cloud/occi/lib/OCCIServer.rb b/src/cloud/occi/lib/OCCIServer.rb index add4a47221..714c175d1c 100755 --- a/src/cloud/occi/lib/OCCIServer.rb +++ b/src/cloud/occi/lib/OCCIServer.rb @@ -210,9 +210,12 @@ class OCCIServer < CloudServer # [return] _String_,_Integer_ Update confirmation msg or error, # status code def put_compute(request, params) + + one_client = get_client(request.env) + vm = VirtualMachineOCCI.new( VirtualMachine.build_xml(params[:id]), - get_client(request.env)) + one_client) rc = vm.info return rc, 400 if OpenNebula.is_error?(rc) From 995094aca1639f9b08eff290acd468c04dc4624f Mon Sep 17 00:00:00 2001 From: Jaime Melis Date: Wed, 22 Dec 2010 18:22:12 +0100 Subject: [PATCH 2/2] Bug #456: The build process should take into account the LDFLAGS environment variable (cherry picked from commit cd8731e18f31d5cd375bc59af80f610b70a3dbc9) --- SConstruct | 6 ++++-- share/scons/get_xmlrpc_config | 2 +- src/nebula/SConstruct | 4 +++- src/scheduler/SConstruct | 16 +++++++++++++++- src/scheduler/src/pool/test/SConstruct | 3 ++- src/scheduler/src/sched/SConstruct | 4 +++- src/scheduler/src/xml/test/SConstruct | 4 ++-- 7 files changed, 30 insertions(+), 9 deletions(-) diff --git a/SConstruct b/SConstruct index ef4d462bbb..d720a751f3 100644 --- a/SConstruct +++ b/SConstruct @@ -123,8 +123,10 @@ else: if not main_env.GetOption('clean'): try: - main_env.ParseConfig('share/scons/get_xmlrpc_config server') - main_env.ParseConfig('share/scons/get_xmlrpc_config client') + main_env.ParseConfig(("LDFLAGS='%s' share/scons/get_xmlrpc_config"+ + " server") % (os.environ['LDFLAGS'],)) + main_env.ParseConfig(("LDFLAGS='%s' share/scons/get_xmlrpc_config"+ + " client") % (os.environ['LDFLAGS'],)) if mysql=='yes': main_env.ParseConfig('mysql_config --cflags --libs') diff --git a/share/scons/get_xmlrpc_config b/share/scons/get_xmlrpc_config index d89e721ed4..ed4f8eba87 100755 --- a/share/scons/get_xmlrpc_config +++ b/share/scons/get_xmlrpc_config @@ -189,7 +189,7 @@ Configs=[ # Compiles test code with given arguments def compile(file, args) logfile="#{file}.log" - command="g++ #{file} -o #{file}.out #{args} 1>>#{logfile} 2>&1" + command="g++ #{file} -o #{file}.out #{ENV['LDFLAGS']} #{args} 1>>#{logfile} 2>&1" open(logfile, "a") {|f| f.write(command+"\n") diff --git a/src/nebula/SConstruct b/src/nebula/SConstruct index ebc9f8145b..5888e48bb7 100644 --- a/src/nebula/SConstruct +++ b/src/nebula/SConstruct @@ -16,6 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +import os Import('env') lib_name='nebula_core' @@ -63,6 +64,7 @@ if env['mysql']=='yes': if not env.GetOption('clean'): - env.ParseConfig('../../share/scons/get_xmlrpc_config server') + env.ParseConfig(("LDFLAGS='%s' ../../share/scons/get_xmlrpc_config"+ + " server") % (os.environ['LDFLAGS'],)) env.Program('oned.cc') diff --git a/src/scheduler/SConstruct b/src/scheduler/SConstruct index e1b03a2f14..a949452d4b 100644 --- a/src/scheduler/SConstruct +++ b/src/scheduler/SConstruct @@ -28,6 +28,19 @@ cwd=os.getcwd() main_env=Environment() main_env['ENV']['PATH']=os.environ['PATH'] +# snippet borrowed from http://dev.gentoo.org/~vapier/scons-blows.txt +# makes scons aware of build related environment variables +if os.environ.has_key('CC'): + main_env['CC'] = os.environ['CC'] +if os.environ.has_key('CFLAGS'): + main_env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) +if os.environ.has_key('CXX'): + main_env['CXX'] = os.environ['CXX'] +if os.environ.has_key('CXXFLAGS'): + main_env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) +if os.environ.has_key('LDFLAGS'): + main_env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) + # Add builders for flex and bison add_lex(main_env) add_bison(main_env) @@ -70,7 +83,8 @@ if xmlrpc_dir!='none': main_env.Append(LIBPATH=[xmlrpc_dir+"/lib"]) main_env.Append(CPPPATH=[xmlrpc_dir+"/include"]) -main_env.ParseConfig('../../share/scons/get_xmlrpc_config client') +main_env.ParseConfig(("LDFLAGS='%s' ../../share/scons/get_xmlrpc_config"+ + " client") % (os.environ['LDFLAGS'],)) #------------------------------------------------------------------------------- # build lex/bison diff --git a/src/scheduler/src/pool/test/SConstruct b/src/scheduler/src/pool/test/SConstruct index bca8de5178..ef3af3815a 100644 --- a/src/scheduler/src/pool/test/SConstruct +++ b/src/scheduler/src/pool/test/SConstruct @@ -77,7 +77,8 @@ if xmlrpc_dir!='none': main_env.Append(LIBPATH=[xmlrpc_dir+"/lib"]) main_env.Append(CPPPATH=[xmlrpc_dir+"/include"]) -main_env.ParseConfig('../../../../../share/scons/get_xmlrpc_config client') +main_env.ParseConfig(("LDFLAGS='%s' ../../../../../share/scons/"+ + "get_xmlrpc_config client") % (os.environ['LDFLAGS'],)) #------------------------------------------------------------------------------- # build lex/bison diff --git a/src/scheduler/src/sched/SConstruct b/src/scheduler/src/sched/SConstruct index 350fd93f10..3974a7fd22 100644 --- a/src/scheduler/src/sched/SConstruct +++ b/src/scheduler/src/sched/SConstruct @@ -16,6 +16,7 @@ # limitations under the License. # #--------------------------------------------------------------------------- # +import os Import('env') lib_name='scheduler_sched' @@ -38,6 +39,7 @@ env.Append(LIBS=[ ]) if not env.GetOption('clean'): - env.ParseConfig('../../../../share/scons/get_xmlrpc_config client') + env.ParseConfig(("LDFLAGS='%s' ../../../../share/scons/get_xmlrpc_config"+ + " client") % (os.environ['LDFLAGS'],)) env.Program('mm_sched.cc') diff --git a/src/scheduler/src/xml/test/SConstruct b/src/scheduler/src/xml/test/SConstruct index d750c4e7c5..1e7a9dbb36 100644 --- a/src/scheduler/src/xml/test/SConstruct +++ b/src/scheduler/src/xml/test/SConstruct @@ -72,8 +72,8 @@ if xmlrpc_dir!='none': main_env.Append(LIBPATH=[xmlrpc_dir+"/lib"]) main_env.Append(CPPPATH=[xmlrpc_dir+"/include"]) -main_env.ParseConfig('../../../../../share/scons/get_xmlrpc_config client') - +main_env.ParseConfig(("LDFLAGS='%s' ../../../../../share/scons/"+ + "get_xmlrpc_config client") % (os.environ['LDFLAGS'],)) #------------------------------------------------------------------------------- # build lex/bison #-------------------------------------------------------------------------------