From 45372b5a4b925f4ba2f0ad43b12fdf837d11f760 Mon Sep 17 00:00:00 2001 From: daniceexi Date: Tue, 10 May 2011 11:32:51 +0000 Subject: [PATCH] defect 3297886: fix the issue that handling the variable in the dir of statemnt attribute git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@9539 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- xCAT-server/lib/xcat/plugins/anaconda.pm | 2 +- xCAT-server/lib/xcat/plugins/sles.pm | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/xCAT-server/lib/xcat/plugins/anaconda.pm b/xCAT-server/lib/xcat/plugins/anaconda.pm index 616c7d6ea..2fc01b9e0 100644 --- a/xCAT-server/lib/xcat/plugins/anaconda.pm +++ b/xCAT-server/lib/xcat/plugins/anaconda.pm @@ -579,7 +579,7 @@ sub mknetboot } if(grep /\$|#CMD/, $dir) { $dir = xCAT::SvrUtils->subVars($dir, $node, 'dir', $callback); - $dir = ~ s/\/\//\//g; + $dir =~ s/\/\//\//g; } if($server) { $server = xCAT::SvrUtils->subVars($server, $node, 'server', $callback); diff --git a/xCAT-server/lib/xcat/plugins/sles.pm b/xCAT-server/lib/xcat/plugins/sles.pm index 7b4050d0d..7969484c7 100644 --- a/xCAT-server/lib/xcat/plugins/sles.pm +++ b/xCAT-server/lib/xcat/plugins/sles.pm @@ -395,7 +395,7 @@ sub mknetboot } if(grep /\$|#CMD/, $dir) { $dir = xCAT::SvrUtils->subVars($dir, $node, 'dir', $callback); - $dir = ~ s/\/\//\//g; + $dir =~ s/\/\//\//g; } if($server) { $server = xCAT::SvrUtils->subVars($server, $node, 'server', $callback);