From 3344ec3af34fa18766a3ee8e0106be4a52b167eb Mon Sep 17 00:00:00 2001
From: lissav <lissav@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Fri, 26 Jun 2009 12:11:48 +0000
Subject: [PATCH] fix if to destination does not exit on the sending node in
 the rsync file,  it is assumed to be a directory

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@3648 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 perl-xCAT/xCAT/DSHCLI.pm | 68 ++++++++++++++++++++++++++++------------
 1 file changed, 48 insertions(+), 20 deletions(-)

diff --git a/perl-xCAT/xCAT/DSHCLI.pm b/perl-xCAT/xCAT/DSHCLI.pm
index 5a1a2658c..a7881f073 100644
--- a/perl-xCAT/xCAT/DSHCLI.pm
+++ b/perl-xCAT/xCAT/DSHCLI.pm
@@ -4313,13 +4313,20 @@ sub parse_rsync_input_file_on_MN
             my $dest_file = $2;
             $dest_file =~ s/[\s;]//g;
             my $dest_dir;
-            if (-d $dest_file)
-            {    # if a directory , just use
-                $dest_dir = $dest_file;
+            if (-e $dest_file)
+            {    # if dest file exist
+                if (-d $dest_file)
+                {    # if a directory , just use
+                    $dest_dir = $dest_file;
+                }
+                else
+                {    # strip off the file
+                    $dest_dir = dirname($dest_file);
+                }
             }
             else
-            {    # strip off the file
-                $dest_dir = dirname($dest_file);
+            {        # destination does not exist, just use as is
+                $dest_dir = $dest_file;
             }
             $dest_dir =~ s/\s*//g;    #remove blanks
 
@@ -4350,13 +4357,20 @@ sub parse_rsync_input_file_on_MN
                     my $src_basename = basename($srcfile);    # get file name
 
                     my $dest_basename;    # destination file name
-                    if (-d $dest_file)
-                    {    # if a directory, get filename from src
-                        $dest_basename = $src_basename;
+                    if (-e $dest_file)
+                    {                     # if destination file  exist
+                        if (-d $dest_file)
+                        {    # if a directory, get filename from src
+                            $dest_basename = $src_basename;
+                        }
+                        else
+                        {    # get the file name from the destination
+                            $dest_basename = basename($dest_file);
+                        }
                     }
                     else
-                    {    # get the file name from the destination
-                        $dest_basename = basename($dest_file);
+                    {        #destination does not exist, get filename from src
+                        $dest_basename = $src_basename;
                     }
                     if ($rsyncSN == 1)    # dest file will be the same as src
                     {                     #  syncing the SN
@@ -4451,13 +4465,20 @@ sub parse_rsync_input_file_on_SN
             my $dest_file = $2;
             $dest_file =~ s/[\s;]//g;
             my $dest_dir;
-            if (-d $dest_file)
-            {    # if a directory , just use
-                $dest_dir = $dest_file;
+            if (-e $dest_file)
+            {
+                if (-d $dest_file)
+                {    # if a directory , just use
+                    $dest_dir = $dest_file;
+                }
+                else
+                {    # strip off the file
+                    $dest_dir = dirname($dest_file);
+                }
             }
             else
-            {    # strip off the file
-                $dest_dir = dirname($dest_file);
+            {        # destination does not exist
+                $dest_dir = $dest_file;
             }
             $dest_dir =~ s/\s*//g;    #remove blanks
 
@@ -4481,13 +4502,20 @@ sub parse_rsync_input_file_on_SN
                     my $src_basename = basename($srcfile);    # get file name
 
                     my $dest_basename;    # destination file name
-                    if (-d $dest_file)
-                    {    # if a directory, get filename from src
-                        $dest_basename = $src_basename;
+                    if (-e $dest_file)
+                    {                     # if destination file  exist
+                        if (-d $dest_file)
+                        {    # if a directory, get filename from src
+                            $dest_basename = $src_basename;
+                        }
+                        else
+                        {    # get the file name from the destination
+                            $dest_basename = basename($dest_file);
+                        }
                     }
                     else
-                    {    # get the file name from the destination
-                        $dest_basename = basename($dest_file);
+                    {        #destination does not exist, get filename from src
+                        $dest_basename = $src_basename;
                     }
                     $$options{'destDir_srcFile'}{$target_node}{$dest_dir} ||=
                       $dest_basename =~ s/[\s;]//g;