From 99f107fcb084fa52997b1a106825f54ae7fe793a Mon Sep 17 00:00:00 2001 From: Orsiris de Jong Date: Wed, 14 Jun 2023 13:49:36 +0200 Subject: [PATCH] Add general fix for #242 --- dev/ofunctions.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dev/ofunctions.sh b/dev/ofunctions.sh index 4f1f958..777aeed 100755 --- a/dev/ofunctions.sh +++ b/dev/ofunctions.sh @@ -2277,10 +2277,13 @@ function InitRemoteOSDependingSettings { RSYNC_DEFAULT_ARGS="-ltD -8" ## NPF-MOD: Regarding #242, we need to add --old-args if rsync > 3.2.3 - rsync_version=$("${RSYNC_EXECUTABLE}" --version 2>/dev/null| head -1 | awk '{print $3}') - if [ $(Vercomp $rsync_version 3.2.3) -eq 1 ]; then - RSYNC_DEFAULT_ARGS="$RSYNC_DEFAULT_ARGS --old-args" - fi + #rsync_version=$("${RSYNC_EXECUTABLE}" --version 2>/dev/null| head -1 | awk '{print $3}') + #if [ $(VerComp $rsync_version 3.2.3) -eq 1 ]; then + # RSYNC_DEFAULT_ARGS="$RSYNC_DEFAULT_ARGS --old-args" + #fi + # NPF-MOD: Strangely enough, also happens on RHEL7 rsync 3.1.1 + # Let's resolve this easier + RSYNC_OLD_ARGS=1 if [ "$_DRYRUN" == true ]; then RSYNC_DRY_ARG="-n"