shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-20 10:50:08 +03:00
Code Releases Wiki Activity

Merge branch 'master' into feature-575

Browse Source
This commit is contained in:
Ruben S. Montero 2011-04-14 17:07:13 +02:00
commit 993a42bed8
2 changed files with 16 additions and 4 deletions
SConstruct
src/vmm_mad/remotes
poll_xen_kvm.rb

18
SConstruct

@ -127,15 +127,27 @@ else:
main_env.Append(parsers='no')
if not main_env.GetOption('clean'):
try:
if mysql=='yes':
main_env.ParseConfig('mysql_config --cflags --libs')
except Exception, e:
print ""
print "mysql_config was not found in the path"
print ""
print "Check that mysql development package is installed and"
print "mysql_config is in the path. If your mysql config tool"
print "is called mysql5_config make a symlink as mysql_config"
print "to a directory in the path."
print ""
exit(-1)
try:
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')
except Exception, e:
print ""
print "Error searching for xmlrpc-c libraries. Please check this"+\

2
src/vmm_mad/remotes/poll_xen_kvm.rb

@ -118,7 +118,7 @@ private
lines=text.split(/\n/)[2..-1]
lines.map do |line|
line.split(/\s+/)[1]
line.split(/\s+/).delete_if {|d| d.empty? }[1]
end
end