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

Fix the error when using array ref in updatenode with old version perl, it is introduced by PR#4484 (#4518)

Browse Source
This commit is contained in:
Bin Xu
2017-12-14 11:34:02 +08:00
committed by yangsong
parent 5bf5058f6d
commit 2df491d018
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
xCAT-server/lib/xcat/plugins/updatenode.pm
View File

@ -1694,21 +1694,21 @@ sub updatenodesyncfiles
}
}
my $dhs_from_user_env;
my $dsh_from_user_env;
# get the Environment Variables and set DSH_FROM_USERID if possible (From updatenode client)
if (defined($request->{environment})) {
foreach my $envar (@{ $request->{environment} })
{
if ($envar =~ /^DSH_FROM_USERID=/) {
$dhs_from_user_env = $envar;
$dsh_from_user_env = $envar;
last;
}
}
}
unless ($dhs_from_user_env) {
unless ($dsh_from_user_env) {
# $request->{username} is gotten from CN in client certificate
if (($request->{username}) && defined($request->{username}->[0])) {
$dhs_from_user_env = 'DSH_FROM_USERID=' . $request->{username}->[0];
$dsh_from_user_env = 'DSH_FROM_USERID=' . $request->{username}->[0];
}
}
@ -1762,8 +1762,8 @@ sub updatenodesyncfiles
} else { # else this is updatenode -F
$env = ["DSH_RSYNC_FILE=$synclist"];
}
if ($dhs_from_user_env) {
push $env, $dhs_from_user_env;
if ($dsh_from_user_env) {
push @$env, $dsh_from_user_env;
}
push @$args, "--nodestatus";