1
=== modified file 'ubuntuone/syncdaemon/local_rescan.py'
2
--- ubuntuone/syncdaemon/local_rescan.py	2010-02-10 19:10:37 +0000
3
+++ ubuntuone/syncdaemon/local_rescan.py	2010-02-11 13:21:29 +0000
4
@@ -28,6 +28,9 @@
5
28
from ubuntuone.syncdaemon.filesystem_manager import get_stat
28
from ubuntuone.syncdaemon.filesystem_manager import get_stat
6
29
from twisted.internet import defer, reactor
29
from twisted.internet import defer, reactor
7
30
30
8
31
from ubuntuone.syncdaemon.interfaces import IMarker
9
32
10
33
11
31
class ScanTransactionDirty(Exception):
34
class ScanTransactionDirty(Exception):
12
32
    """The transaction was dirty."""
35
    """The transaction was dirty."""
13
33
36
14
@@ -77,8 +80,14 @@
15
77
        """Process the trash of FSM and send AQ orders to unlink the nodes."""
80
        """Process the trash of FSM and send AQ orders to unlink the nodes."""
16
78
        log_info("processing trash")
81
        log_info("processing trash")
17
79
        for share_id, node_id, parent_id in self.fsm.get_iter_trash():
82
        for share_id, node_id, parent_id in self.fsm.get_iter_trash():
20
80
            log_info("unlink from trash: share_id: %r   parent_id: %s   "
83
            datalog = "share_id: %r   parent_id: %r   node_id: %r" % (
21
81
                     "node_id: %r", share_id, parent_id, node_id)
84
                      share_id, parent_id, node_id)
22
85
            if node_id is None or IMarker.providedBy(parent_id):
23
86
                # situation where the node is not in the server
24
87
                log_info("removing from trash: " + datalog)
25
88
                self.fsm.remove_from_trash(share_id, node_id)
26
89
                continue
27
90
            log_info("unlink from trash: " + datalog)
28
82
            self.aq.unlink(share_id, parent_id, node_id)
91
            self.aq.unlink(share_id, parent_id, node_id)
29
83
92
30
84
    def _get_volumes(self, access_level='Modify'):
93
    def _get_volumes(self, access_level='Modify'):
Reviewer	Date Requested	Status
Eric Casteleijn (community)		Approve on 2010-02-10
Rick McBride (community)	2010-02-10	Approve on 2010-02-10
Review via email: mp+19024@code.launchpad.net