arif/xcat-core
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

checkin merge support

Browse Source 
git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@13363 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
This commit is contained in:
lissav 2012-07-27 15:33:13 +00:00
parent 0ecdb2c460
commit 6041cb6a8f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
perl-xCAT/xCAT/RSYNC.pm
View File

@ -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