summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSiddharth Ravikumar <sravik@bgsu.edu>2015-08-27 10:01:40 -0400
committerSiddharth Ravikumar <sravik@bgsu.edu>2015-08-27 10:01:40 -0400
commit1a7f1f42d192beeb2056c0ca14d363255c491e14 (patch)
tree3621ba73e95d4d803589f9599cb9cda5cb5ae5dd
parenta9082be0a03c11b46f6974b1b9476db9914055be (diff)
combox/events.py: fixed a logical error in NodeDirMonitor.on_moved
-rw-r--r--combox/events.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/combox/events.py b/combox/events.py
index 42cd617..49d1b1a 100644
--- a/combox/events.py
+++ b/combox/events.py
@@ -348,7 +348,7 @@ class NodeDirMonitor(LoggingEventHandler):
self.silo.node_rem(silo_node_dict, cb_filename)
return
elif (not self.shardp(event.src_path) and
- self.shardp(event.src_path) and
+ self.shardp(event.dest_path) and
path.exists(dest_cb_path) and
not event.is_directory):
# This is Dropbox specific :|
@@ -357,6 +357,7 @@ class NodeDirMonitor(LoggingEventHandler):
# being modified, so our previous assumption that it was
# deleted was wrong, so we remove that information from
# the silo.
+ cb_filename = dest_cb_path
with self.lock:
self.silo.node_rem('file_deleted', cb_filename)
# Next watchdog detects that the shard was modified