From 4bd8a0e02005761e63324af4589799a1c361c06a Mon Sep 17 00:00:00 2001 From: lissav Date: Mon, 29 Jul 2013 13:56:39 -0400 Subject: [PATCH 1/3] Update version to the next release --- Version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version b/Version index 1817afea4..9f8d8a916 100644 --- a/Version +++ b/Version @@ -1 +1 @@ -2.8.2 +2.8.3 From d3bf022de78e3ffc2d28cac8a79982bec10fa11d Mon Sep 17 00:00:00 2001 From: lissav Date: Mon, 29 Jul 2013 13:56:39 -0400 Subject: [PATCH 2/3] Update version to the next release --- Version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version b/Version index 1817afea4..9f8d8a916 100644 --- a/Version +++ b/Version @@ -1 +1 @@ -2.8.2 +2.8.3 From 811a3eda654a8ef22b9e080fcdd47de104c364fa Mon Sep 17 00:00:00 2001 From: lissav Date: Mon, 29 Jul 2013 14:07:02 -0400 Subject: [PATCH 3/3] Fix for defect 3717 --- perl-xCAT/xCAT/DSHCLI.pm | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm index adede62a8..ecd6de7c8 100644 --- a/perl-xCAT/xCAT/DSHCLI.pm +++ b/perl-xCAT/xCAT/DSHCLI.pm @@ -1024,7 +1024,7 @@ sub fork_fanout_dsh && (keys(%$targets_active) < $$options{'fanout'})) { my $user_target = shift @$targets_waiting; - # now add export NODE=nodename to the pre-command if not a device; + # now add export NODE=nodename to the pre-command, if not a device; my $exportnode; if (($$options{'devicetype'})) { $exportnode=""; @@ -2345,10 +2345,14 @@ sub config_dsh } } else + { + # if not Mellanox, it does not need a config file + if (!($$options{'devicetype'} =~ /Mellanox/i)) { my $rsp = {}; - $rsp->{error}->[0] = "EMsgMISSING_DEV_CFG"; - xCAT::MsgUtils->message('E', $rsp, $::CALLBACK); + $rsp->{error}->[0] = "The config file: $devicepath is missing"; + xCAT::MsgUtils->message('E', $rsp, $::CALLBACK); + } } } @@ -5782,8 +5786,10 @@ sub bld_and_run_append # that were rsyn'd to at least one node if ($tmpappendfile eq $ps) { my $parm="$appendfile:$filetoappend "; - - $::xdcpappendparms .= $parm; + # check to see if the parameter is already in the list + if (!($::xdcpappendparms =~ /$parm/)) { + $::xdcpappendparms .= $parm; + } $processappend=1; } @@ -5919,8 +5925,10 @@ sub bld_and_run_merge # that were rsyn'd to at least one node if ($tmpmergefile eq $ps) { my $parm="$mergefile:$filetomerge "; - - $::xdcpmergeparms .= $parm; + # check to see if the parameter is already in the list + if (!($::xdcpmergeparms =~ /$parm/)) { + $::xdcpmergeparms .= $parm; + } $processmerge=1; }