xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-08-20 02:00:24 +00:00
Code Issues Releases Wiki Activity

Merge pull request #652 from zet809/fix_issue_649

Browse Source 
Fix issue 649: [FVT]2.12:docker : command rpower 's return value need be modified
This commit is contained in:
chenglch
2016-01-25 15:08:46 +08:00
parent 9f844a62f4 ae3f284217
commit 150e3e0679
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
xCAT-server/lib/xcat/plugins/docker.pm
View File

@@ -228,10 +228,10 @@ sub http_state_code_info {
elsif ($state_code eq '304') {
if (defined $curr_status) {
if ($curr_status eq "INIT_TO_WAIT_FOR_START_DONE") {
return [1, "container already started"];
return [0, "container already started"];
}
else {
return [1, "container already stoped"];
return [0, "container already stoped"];
}
}
else {
@@ -443,7 +443,7 @@ sub single_state_engine {
foreach my $tmp (@msg) {
$tmp->[1] =~ s/\035//g;
if ($tmp->[0]) {
$global_callback->({node=>[{name=>[$node],error=>["$tmp->[1]"]}]},errorcode=>"$tmp->[0]");
$global_callback->({node=>[{name=>[$node],error=>["$tmp->[1]"],errorcode=>["$tmp->[0]"]}]});
}
else {
$global_callback->({node=>[{name=>[$node],data=>["$tmp->[1]"]}]});