From: Daira Hopwood <daira@jacaranda.org>
Date: Thu, 21 May 2015 14:45:18 +0000 (+0100)
Subject: Cosmetics.
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=5b7fc27a5375f17c557ea679d73a668c035482bc;p=tahoe-lafs%2Ftahoe-lafs.git

Cosmetics.

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 75fcb69a..84df4f97 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -118,7 +118,7 @@ class DropUploader(service.MultiService):
             islink = os.path.islink(childpath)
 
             if islink:
-                self.warn("WARNING: cannot backup symlink %s" % quote_local_unicode_path(childpath))
+                self.warn("WARNING: magic folder: cannot upload symlink %s" % quote_local_unicode_path(childpath))
             elif isdir:
                 # process directories unconditionally
                 self._append_to_deque(childpath)
@@ -130,7 +130,7 @@ class DropUploader(service.MultiService):
                 if must_upload:
                     self._append_to_deque(childpath)
             else:
-                self.warn("WARNING: cannot backup special file %s" % quote_local_unicode_path(childpath))
+                self.warn("WARNING: magic folder: cannot upload special file %s" % quote_local_unicode_path(childpath))
 
     def startService(self):
         self._db = backupdb.get_backupdb(self._dbfile)
diff --git a/src/allmydata/windows/inotify.py b/src/allmydata/windows/inotify.py
index 887c6384..73431091 100644
--- a/src/allmydata/windows/inotify.py
+++ b/src/allmydata/windows/inotify.py
@@ -74,10 +74,10 @@ ReadDirectoryChangesW = WINFUNCTYPE(
 FILE_NOTIFY_CHANGE_FILE_NAME     = 0x00000001
 FILE_NOTIFY_CHANGE_DIR_NAME      = 0x00000002
 FILE_NOTIFY_CHANGE_ATTRIBUTES    = 0x00000004
-#FILE_NOTIFY_CHANGE_SIZE         = 0x00000008
+FILE_NOTIFY_CHANGE_SIZE          = 0x00000008
 FILE_NOTIFY_CHANGE_LAST_WRITE    = 0x00000010
 FILE_NOTIFY_CHANGE_LAST_ACCESS   = 0x00000020
-#FILE_NOTIFY_CHANGE_CREATION     = 0x00000040
+FILE_NOTIFY_CHANGE_CREATION      = 0x00000040
 FILE_NOTIFY_CHANGE_SECURITY      = 0x00000100
 
 # <https://msdn.microsoft.com/en-us/library/windows/desktop/aa364391%28v=vs.85%29.aspx>
@@ -339,9 +339,9 @@ class INotify(PollMixin):
         self._called_stopReading = True
 
         # This is tricky. We don't know where the notifier thread is in its loop,
-        # so it could block in get_notifications *after* any pending I/O has been
-        # cancelled. Therefore, we need to continue interrupting until we see
-        # that the thread has actually stopped.
+        # so it could block in get_notifications *after* any pending I/O from a previous
+        # call to get_notifications has been cancelled. Therefore, we need to continue
+        # interrupting until we see that the thread has actually stopped.
         def _try_to_stop():
             if self._stopped:
                 return True