From 6041cb6a8f7e88ef6ded3d6a0b0053b3e21d6359 Mon Sep 17 00:00:00 2001 From: lissav Date: Fri, 27 Jul 2012 15:33:13 +0000 Subject: [PATCH] checkin merge support git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13363 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd --- perl-xCAT/xCAT/RSYNC.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/perl-xCAT/xCAT/RSYNC.pm b/perl-xCAT/xCAT/RSYNC.pm index 79b6b44c5..12534849e 100644 --- a/perl-xCAT/xCAT/RSYNC.pm +++ b/perl-xCAT/xCAT/RSYNC.pm @@ -116,7 +116,7 @@ sub remote_copy_command # if only syncing the service node or # (no postscripts and no append lines) then do not # get update file notification - if (($::SYNCSN == 1) || ((!(defined @::postscripts) && (!(defined @::appendlines))))) { + if (($::SYNCSN == 1) || ((!(defined @::postscripts)) && (!(defined @::appendlines)) && (!(defined @::mergelines)))) { $sync_opt .= '-Lprogtz '; } else { $sync_opt .= '-Liprogtz --out-format=%f%L '; # add notify of update