Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid race condition crash on directory deletion #281

Merged
merged 1 commit into from
Oct 25, 2014
Merged

Avoid race condition crash on directory deletion #281

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 11 additions & 1 deletion src/watchdog/utils/dirsnapshot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@

"""

import errno
import os
from stat import S_ISDIR
from watchdog.utils import platform
Expand Down Expand Up @@ -208,7 +209,16 @@ def __init__(self, path, recursive=True,
self._inode_to_path[(st.st_ino, st.st_dev)] = path

def walk(root):
paths = [os.path.join(root, name) for name in listdir(root)]
try:
paths = [os.path.join(root, name) for name in listdir(root)]
except OSError as e:
# Directory may have been deleted between finding it in the directory
# list of its parent and trying to delete its contents. If this
# happens we treat it as empty.
if e.errno == errno.ENOENT:
return
else:
raise
entries = []
for p in paths:
try:
Expand Down