From 2df491d0182225c299e5fe526bb2757d2b004d9d Mon Sep 17 00:00:00 2001 From: Bin Xu Date: Thu, 14 Dec 2017 11:34:02 +0800 Subject: [PATCH] Fix the error when using array ref in updatenode with old version perl, it is introduced by PR#4484 (#4518) --- xCAT-server/lib/xcat/plugins/updatenode.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/updatenode.pm b/xCAT-server/lib/xcat/plugins/updatenode.pm index c92b3d949..729fed4dd 100644 --- a/xCAT-server/lib/xcat/plugins/updatenode.pm +++ b/xCAT-server/lib/xcat/plugins/updatenode.pm @@ -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";