diff options
| author | Aleksey Lim <alsroot@sugarlabs.org> | 2013-03-02 10:53:36 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@sugarlabs.org> | 2013-03-02 10:53:36 (GMT) |
| commit | 03d09cad4f6ac302951da2ed90a1ccffa38d5704 (patch) | |
| tree | 6597804580d9b200af0594f39d914c5414612dec /misc | |
| parent | 7e245b1867012f9b16d0a147304a5874ad87cf08 (diff) | |
Fix sync issue when merged record needs to be pulled
Diffstat (limited to 'misc')
| -rwxr-xr-x | misc/sugar-network-sync | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/misc/sugar-network-sync b/misc/sugar-network-sync index 96913f8..7161a5c 100755 --- a/misc/sugar-network-sync +++ b/misc/sugar-network-sync @@ -106,9 +106,9 @@ upload() { fi if [ -e "${cookie}" ]; then - if grep unset_sugar_network_sync "${cookie}" >/dev/null; then + if grep unset_sugar_network_pull "${cookie}" >/dev/null; then rm "${cookie}" - elif grep sugar_network_sync "${cookie}" >/dev/null; then + elif grep sugar_network_pull "${cookie}" >/dev/null; then phase "Postpone pull with ${cookie}" else rm "${cookie}" |