From dfec5246f89b59599030766a4ad8e8c8a69ef278 Mon Sep 17 00:00:00 2001 From: jbjohnso Date: Mon, 13 Apr 2009 13:14:46 +0000 Subject: [PATCH] -Fix extraneous output on power request that does no change for kvm guests git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3171 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/kvm.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/kvm.pm b/xCAT-server/lib/xcat/plugins/kvm.pm index 4158d5252..582a9babb 100644 --- a/xCAT-server/lib/xcat/plugins/kvm.pm +++ b/xCAT-server/lib/xcat/plugins/kvm.pm @@ -602,23 +602,23 @@ sub power { ($dom,$errstr) = makedom($node,$cdloc); if ($errstr) { return (1,$errstr); } } else { - $retstring .= " $status_noop"; + $retstring .= "$status_noop"; } } elsif ($subcommand eq 'off') { if ($dom) { $dom->destroy(); - } else { $retstring .= " $status_noop"; } + } else { $retstring .= "$status_noop"; } } elsif ($subcommand eq 'softoff') { if ($dom) { $dom->shutdown(); - } else { $retstring .= " $status_noop"; } + } else { $retstring .= "$status_noop"; } } elsif ($subcommand eq 'reset') { if ($dom) { $dom->destroy(); ($dom,$errstr) = makedom($node,$cdloc); if ($errstr) { return (1,$errstr); } $retstring.="reset"; - } else { $retstring .= " $status_noop"; } + } else { $retstring .= "$status_noop"; } } else { unless ($subcommand =~ /^stat/) { return (1,"Unsupported power directive '$subcommand'"); @@ -1061,7 +1061,7 @@ sub forward_data { if (($text) && ($text =~ /$status_noop/)) { $no_op=1; #remove the symbols that meant for use by node status - $_->{node}->[0]->{data}->[0]->{contents}->[0] =~ s/ $status_noop//; + $_->{node}->[0]->{data}->[0]->{contents}->[0] =~ s/$status_noop//; } } #print "data:". $_->{node}->[0]->{data}->[0]->{contents}->[0] . "\n";