WMDE
/
osync
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Enfore SKIP_DELETION when SYNC_TYPE set

This commit is contained in:
deajan 2019-05-20 22:43:31 +02:00
parent aca0be5a9b
commit 301e0d69e1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dev/n_osync.sh
View File

@ -7,7 +7,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
AUTHOR="(C) 2013-2019 by Orsiris de Jong" AUTHOR="(C) 2013-2019 by Orsiris de Jong"
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr" CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
PROGRAM_VERSION=1.3.0-beta2 PROGRAM_VERSION=1.3.0-beta2
PROGRAM_BUILD=2019052013 PROGRAM_BUILD=2019052014
IS_STABLE=false IS_STABLE=false
CONFIG_FILE_REVISION_REQUIRED=1.3.0 CONFIG_FILE_REVISION_REQUIRED=1.3.0
@ -1741,11 +1741,15 @@ function Sync {
if [ "$SYNC_TYPE" == "initiator2target" ]; then if [ "$SYNC_TYPE" == "initiator2target" ]; then
resumeInitiator="${SYNC_ACTION[5]}" resumeInitiator="${SYNC_ACTION[5]}"
resumeTarget="${SYNC_ACTION[6]}" resumeTarget="${SYNC_ACTION[6]}"
rsyncRemoteDelete=true if [ $(ArrayContains "${TARGET[$__type]}" "${SKIP_DELETION[@]}") -ne 0 ]; then
rsyncRemoteDelete=true
fi
elif [ "$SYNC_TYPE" == "target2initiator" ]; then elif [ "$SYNC_TYPE" == "target2initiator" ]; then
resumeInitiator="${SYNC_ACTION[6]}" resumeInitiator="${SYNC_ACTION[6]}"
resumeTarget="${SYNC_ACTION[5]}" resumeTarget="${SYNC_ACTION[5]}"
rsyncRemoteDelete=true if [ $(ArrayContains "${INITIATOR[$__type]}" "${SKIP_DELETION[@]}") -ne 0 ]; then
rsyncRemoteDelete=true
fi
fi fi
################################################################################################################################################# Actual sync begins here ################################################################################################################################################# Actual sync begins here