xCAT/xcat-core
2
0
Fork 0
mirror of https://github.com/xcat2/xcat-core.git synced 2025-05-30 09:36:41 +00:00
Code Issues Releases Wiki Activity

Merge pull request #865 from chenglch/perl-error

Browse Source 
Add check logic before using perl-Error library
This commit is contained in:
zet809 2016-03-29 13:48:54 +08:00
commit 18ae654973
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
perl-xCAT/xCAT/Utils.pm
View File

@ -16,7 +16,6 @@ if ($^O =~ /^aix/i) {
use lib "$::XCATROOT/lib/perl";
# do not put a use or require for xCAT::Table here. Add to each new routine
# needing it to avoid reprocessing of user tables ( ExtTab.pm) for each command call
use Error;
use POSIX qw(ceil);
use File::Path;
use Socket;
@ -4644,9 +4643,21 @@ sub lookupNetboot{
sub is_process_exists{
my $pid = shift;
return 1 if $pid == 0;
# NOTE: Add eval and require to process dependency missing of perl-Error
# package before sles 12 system.
my $miss = undef;
eval {
require Error;
};
if ($@) {
$miss = 1;
}
my $ret = kill(0, $pid);
return 0 if ($!{ESRCH});
return 1 if ($!{EPERM});
if (!$miss) {
return 0 if ($!{ESRCH});
return 1 if ($!{EPERM});
}
if ($ret != 0 ) {
return 1;