summaryrefslogtreecommitdiff
path: root/python3
diff options
context:
space:
mode:
authorSebastien Martini <seb@dbzteam.org>2014-07-05 22:30:53 +0200
committerSebastien Martini <seb@dbzteam.org>2014-07-05 22:30:53 +0200
commita479834f84cdb4d52134275932f033ee5c04c35b (patch)
tree6a3b33f74d3c10ea30c9b3d4ce7ef40d56e87e59 /python3
parentb59a48b05cf851d9f47b16f3a3a3a8eba7e8ddac (diff)
downloadpyinotify-a479834f84cdb4d52134275932f033ee5c04c35b.tar.gz
Handle OSError exception in process_IN_CREATE.
close #76
Diffstat (limited to 'python3')
-rwxr-xr-xpython3/pyinotify.py39
1 files changed, 22 insertions, 17 deletions
diff --git a/python3/pyinotify.py b/python3/pyinotify.py
index de88c65..96ff29c 100755
--- a/python3/pyinotify.py
+++ b/python3/pyinotify.py
@@ -725,23 +725,28 @@ class _SysProcessEvent(_ProcessEvent):
# Since the directory d2 is new, then everything inside it must
# also be new.
created_dir_wd = addw_ret.get(created_dir)
- if (created_dir_wd is not None) and (created_dir_wd > 0):
- for name in os.listdir(created_dir):
- inner = os.path.join(created_dir, name)
- if self._watch_manager.get_wd(inner) is not None:
- continue
- # Generate (simulate) creation events for sub-
- # directories and files.
- if os.path.isfile(inner):
- # symlinks are handled as files.
- flags = IN_CREATE
- elif os.path.isdir(inner):
- flags = IN_CREATE | IN_ISDIR
- else:
- # This path should not be taken.
- continue
- rawevent = _RawEvent(created_dir_wd, flags, 0, name)
- self._notifier.append_event(rawevent)
+ if ((created_dir_wd is not None) and (created_dir_wd > 0) and
+ os.path.isdir(created_dir)):
+ try:
+ for name in os.listdir(created_dir):
+ inner = os.path.join(created_dir, name)
+ if self._watch_manager.get_wd(inner) is not None:
+ continue
+ # Generate (simulate) creation events for sub-
+ # directories and files.
+ if os.path.isfile(inner):
+ # symlinks are handled as files.
+ flags = IN_CREATE
+ elif os.path.isdir(inner):
+ flags = IN_CREATE | IN_ISDIR
+ else:
+ # This path should not be taken.
+ continue
+ rawevent = _RawEvent(created_dir_wd, flags, 0, name)
+ self._notifier.append_event(rawevent)
+ except OSError as err:
+ msg = "process_IN_CREATE, invalid directory: %s"
+ log.debug(msg % str(err))
return self.process_default(raw_event)
def process_IN_MOVED_FROM(self, raw_event):