Changeset c619125 in trunk

Timestamp:

2016-07-21T19:35:59Z (9 years ago)

Author:

Brian Warner <warner@…>

Branches:

master

Children:

1abc2c3

Parents:

d6bb49b

git-author:

Daira Hopwood <daira@…> (2015-10-27 17:09:40)

git-committer:

Brian Warner <warner@…> (2016-07-21 19:35:59)

Message:

Distinguish deletion of directories.

Signed-off-by: Daira Hopwood <daira@…>

File:

• src/allmydata/frontends/magic_folder.py (modified) (1 diff)

src/allmydata/frontends/magic_folder.py ¶

@@ -706 +706 @@
 
             if relpath_u.endswith(u"/"):
-                self._log("mkdir(%r)" % (abspath_u,))
-                d.addCallback(lambda ign: fileutil.make_dirs(abspath_u))
-                d.addCallback(lambda ign: abspath_u)
+                if metadata.get('deleted', False):
+                    self._log("rmdir(%r) ignored" % (abspath_u,))
+                else:
+                    self._log("mkdir(%r)" % (abspath_u,))
+                    d.addCallback(lambda ign: fileutil.make_dirs(abspath_u))
+                    d.addCallback(lambda ign: abspath_u)
             else:
                 d.addCallback(lambda ign: file_node.download_best_version())