From 6d0bf02cfa3b935e1cf5ec094f5670a7538d16f3 Mon Sep 17 00:00:00 2001 From: penguhyang Date: Thu, 25 Aug 2016 14:48:23 +0800 Subject: [PATCH] fix return code is 0 when there are errors (#1763) --- xCAT-server/lib/xcat/plugins/packimage.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/packimage.pm b/xCAT-server/lib/xcat/plugins/packimage.pm index c4c91149c..d5ab79c76 100755 --- a/xCAT-server/lib/xcat/plugins/packimage.pm +++ b/xCAT-server/lib/xcat/plugins/packimage.pm @@ -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; } }