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

Added cleanup bypass

This commit is contained in:
deajan 2013-11-02 23:33:54 +01:00
parent 86b05d1c65
commit abcee91c37
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
osync.sh
View File

@ -3,7 +3,7 @@
###### Osync - Rsync based two way sync engine with fault tolerance ###### Osync - Rsync based two way sync engine with fault tolerance
###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr) ###### (L) 2013 by Orsiris "Ozy" de Jong (www.netpower.fr)
OSYNC_VERSION=0.99RC2 OSYNC_VERSION=0.99RC2
OSYNC_BUILD=0211201301 OSYNC_BUILD=0211201302
DEBUG=no DEBUG=no
SCRIPT_PID=$$ SCRIPT_PID=$$
@ -1314,7 +1314,7 @@ function Sync
function SoftDelete function SoftDelete
{ {
if [ "$CONFLICT_BACKUP" != "no" ] if [ "$CONFLICT_BACKUP" != "no" ] && [ $CONFLICT_BACKUP_DAYS -ne 0 ]
then then
if [ -d "$MASTER_BACKUP_DIR" ] if [ -d "$MASTER_BACKUP_DIR" ]
then then
@ -1385,7 +1385,7 @@ function SoftDelete
fi fi
fi fi
if [ "$SOFT_DELETE" != "no" ] if [ "$SOFT_DELETE" != "no" ] && [ $SOFT_DELETE_DAYS -ne 0 ]
then then
if [ -w "$MASTER_DELETE_DIR" ] if [ -w "$MASTER_DELETE_DIR" ]
then then