Archives/osync
2
0
Fork 0
mirror of https://github.com/deajan/osync synced 2024-11-05 12:01:02 +00:00
Code Issues Releases Wiki Activity

Initial support to resume aborted sync process.

Browse Source
This commit is contained in:
deajan 2013-07-18 22:44:52 +02:00
parent 5107cd8cd7
commit 3432ba57d6
1 changed files with 24 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
osync.sh
View File

@ -698,31 +698,30 @@ function Sync
slave_delete_list
;&
slave-replica-deleted-list.success|update-master-replica.fail|update-slave-replica.fail)
if [ "$CONFLICT_PREVALANCE" != "master" ]
then
sync_update_master
if [ $? != 0 ]
then
return 1
fi
sync_update_slave
if [ $? != 0 ]
then
return 1
fi
else
sync_update_slave
if [ $? != 0 ]
then
return 1
fi
sync_update_master
if [ $? != 0 ]
then
return 1
fi
fi
if [ "$CONFLICT_PREVALANCE" != "master" ]
then
sync_update_master
if [ $? != 0 ]
then
return 1
fi
sync_update_slave
if [ $? != 0 ]
then
return 1
fi
else
sync_update_slave
if [ $? != 0 ]
then
return 1
fi
sync_update_master
if [ $? != 0 ]
then
return 1
fi
fi
;&
update-slave-replica.success|update-master-replica.success|delete-propagation-slave.fail)
delete_on_slave
@ -742,20 +741,6 @@ function Sync
echo "sync.success" > $STATE_DIR/last-action
}
function DummySync
{
# launches foo bar cuu in this order
# get last function, if last was error set err=1
# if sync.success && err=1 boo bar cuu
# set err=0
# if sync.test && err=1 bar cuu
# set err=0
# if sync.e cuu
echo merde
}
function SoftDelete
{
if [ "$CONFLICT_BACKUP" != "no" ]