ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-23 23:02:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

If it's some _other_ error then propagate it!

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-03-06 16:54:37 -05:00
parent c2e19cc098
commit 0822a71163
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/allmydata/test/test_magic_folder.py
View File

@ -3,7 +3,7 @@ import os, sys, time
import stat, shutil, json
import mock
from os.path import join, exists, isdir
from errno import ENOENT
from errno import ENOENT, EISDIR
from twisted.internet import defer, task, reactor
from twisted.python.runtime import platform
@ -659,7 +659,13 @@ class FileOperationsHelper(object):
def delete(self, path_u):
fname = path_u
d = self._uploader.set_hook('inotify')
os.unlink(fname)
try:
os.unlink(fname)
except OSError as e:
if e.errno == EISDIR:
os.rmdir(fname)
else:
raise
self._maybe_notify(fname, self._inotify.IN_DELETE)
return d.addTimeout(self._timeout, reactor)