[Freevo-cvslog] Kaa r2316 - trunk/beacon/src/server

[Dirk M. <di...@fr...>]

Author: dmeyer
Date: Sat Dec 30 17:57:03 2006
New Revision: 2316

Modified:
   trunk/beacon/src/server/crawl.py

Log:
work around inotify problem, fix typo

Modified: trunk/beacon/src/server/crawl.py
==============================================================================
--- trunk/beacon/src/server/crawl.py	(original)
+++ trunk/beacon/src/server/crawl.py	Sat Dec 30 17:57:03 2006
@@ -193,7 +193,11 @@
         log.info('inotify: event %s for "%s"', mask, name)
         
         item = self.db.query(filename=name)
-
+        if not item._beacon_parent.filename in self.monitoring:
+            # that is a different monitor, ignore it
+            # FIXME: this is a bug (missing feature) in inotify
+            return True
+        
         if item._beacon_name.startswith('.'):
             # hidden file, ignore except in move operations
             if mask & INotify.MOVE and args:
@@ -303,7 +307,7 @@
         # ---------------------------------------------------------------------
 
         # before we delete, maybe the filesystem was just umounted
-        if mask & INotify.UMOUNT:
+        if mask & INotify.UNMOUNT:
             # Oops, our filesystem was umounted. This should never happen
             # since all removable drives which could be umounted are on
             # a different media in beacon. It happens sometimes on system