From 9b3ba5ceb819d46739be52d4bde7a3fdf561988f Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 13 Apr 2011 14:45:06 +0200 Subject: [PATCH 1/2] bug #563: delete empty columns from virsh list output (cherry picked from commit 9f7b0864044abc146948f4e756810fae7ba83afb) --- src/vmm_mad/remotes/poll_xen_kvm.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/vmm_mad/remotes/poll_xen_kvm.rb b/src/vmm_mad/remotes/poll_xen_kvm.rb index 6a2521bbef..00e0f6dfec 100755 --- a/src/vmm_mad/remotes/poll_xen_kvm.rb +++ b/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 From 3771d57d2bb6dedfd144c6a7fea490e93fa3475c Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Wed, 13 Apr 2011 15:24:45 +0200 Subject: [PATCH 2/2] bug #401: give special error message when mysql_config not found in SConstruct --- SConstruct | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/SConstruct b/SConstruct index 1c3203d935..ac58affdd1 100644 --- a/SConstruct +++ b/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"+\