xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-10-27 01:15:34 +00:00
Code Issues Releases Wiki Activity

fix return code is 0 when there are errors (#1763)

Browse Source
This commit is contained in:
penguhyang
2016-08-25 14:48:23 +08:00
committed by yangsong
parent fd747d5fc6
commit 6d0bf02cfa
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
xCAT-server/lib/xcat/plugins/packimage.pm
View File

@@ -418,7 +418,7 @@ sub process_request {
my $temppath;
my $oldmask;
unless (-d $rootimg_dir) {
$callback->({ error => ["$rootimg_dir does not exist, run genimage -o $osver -p $profile on a server with matching architecture"] });
$callback->({ error => ["$rootimg_dir does not exist, run genimage -o $osver -p $profile on a server with matching architecture"], errorcode => [1] });
return 1;
}
@@ -427,21 +427,21 @@ sub process_request {
if ($compress eq 'gzip') {
my $isgzip = system("bash -c 'type -p gzip' >/dev/null 2>&1");
unless ($isgzip == 0) {
$callback->({ error => ["Command gzip does not exist, please make sure it is installed."] });
$callback->({ error => ["Command gzip does not exist, please make sure it is installed."], errorcode => [1] });
return 1;
}
$suffix = "gz";
} elsif ($compress eq 'pigz') {
my $ispigz = system("bash -c 'type -p pigz' >/dev/null 2>&1");
unless ($ispigz == 0) {
$callback->({ error => ["Command pigz does not exist, please make sure it is installed."] });
$callback->({ error => ["Command pigz does not exist, please make sure it is installed."], errorcode => [1] });
return 1;
}
$suffix = "gz";
} elsif ($compress eq 'xz') {
my $isxz = system("bash -c 'type -p xz' >/dev/null 2>&1");
unless ($isxz == 0) {
$callback->({ error => ["Command xz does not exist, please make sure it is installed."] });
$callback->({ error => ["Command xz does not exist, please make sure it is installed."], errorcode => [1] });
return 1;
}
$suffix = "xz";
@@ -458,7 +458,7 @@ sub process_request {
if ($isgzip == 0) {
$compress = "gzip";
} else {
$callback->({ error => ["The default compress tool 'gzip' and 'pigz' does not exist, please specify an available compress method with '-c'."] });
$callback->({ error => ["The default compress tool 'gzip' and 'pigz' does not exist, please specify an available compress method with '-c'."], errorcode => [1] });
return 1;
}
}