|
|
|
@ -9,7 +9,7 @@ PROGRAM="osync" # Rsync based two way sync engine with fault tolerance
|
|
|
|
|
AUTHOR="(C) 2013-2018 by Orsiris de Jong"
|
|
|
|
|
CONTACT="http://www.netpower.fr/osync - ozy@netpower.fr"
|
|
|
|
|
PROGRAM_VERSION=1.3.0-beta1
|
|
|
|
|
PROGRAM_BUILD=2018100201
|
|
|
|
|
PROGRAM_BUILD=2018100202
|
|
|
|
|
IS_STABLE=no
|
|
|
|
|
|
|
|
|
|
##### Execution order #__WITH_PARANOIA_DEBUG
|
|
|
|
@ -994,7 +994,7 @@ function conflictList {
|
|
|
|
|
retval=$?
|
|
|
|
|
|
|
|
|
|
#WIP
|
|
|
|
|
if [ $TRAVIS_RUN == true ]; then
|
|
|
|
|
if [ "$TRAVIS_RUN" == true ]; then
|
|
|
|
|
echo "conflictList debug retval=$retval"
|
|
|
|
|
cat "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.${INITIATOR[$__type]}.$SCRIPT_PID.$TSTAMP"
|
|
|
|
|
cat "$RUN_DIR/$PROGRAM.${FUNCNAME[0]}.${TARGET[$__type]}.$SCRIPT_PID.$TSTAMP"
|
|
|
|
@ -2312,7 +2312,7 @@ function LogConflicts {
|
|
|
|
|
local body
|
|
|
|
|
|
|
|
|
|
#WIP
|
|
|
|
|
if [ $TRAVIS_RUN == true ]; then
|
|
|
|
|
if [ "$TRAVIS_RUN" == true ]; then
|
|
|
|
|
cat "$RUN_DIR/$PROGRAM.conflictList.compare.$SCRIPT_PID.$TSTAMP"
|
|
|
|
|
fi
|
|
|
|
|
|
|
|
|
|