From: Daira Hopwood <daira@jacaranda.org>
Date: Tue, 21 Apr 2015 22:53:39 +0000 (+0100)
Subject: Change when _scan is called.
X-Git-Url: https://git.rkrishnan.org/zeppelin?a=commitdiff_plain;h=fed4b07bc032ae6117f7473d6f2b62fe610db156;p=tahoe-lafs%2Ftahoe-lafs.git

Change when _scan is called.

Signed-off-by: Daira Hopwood <daira@jacaranda.org>
---

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index 0b3287c5..e02caa52 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -119,11 +119,12 @@ class DropUploader(service.MultiService):
                 self.warn("WARNING: cannot backup symlink %s" % quote_local_unicode_path(childpath))
             elif isdir:
                 print "isdir"
-                # recurse on the child directory
-                self._scan(childpath)
                 must_upload = self._check_db_file(childpath.decode('UTF-8'))
                 if must_upload:
                     self._append_to_deque(childpath)
+
+                # recurse on the child directory
+                self._scan(childpath)
             elif isfile:
                 print "isfile %s" % (childpath,)
                 must_upload = self._check_db_file(childpath.decode('UTF-8'))