From 1879b6855429b40105b5caafe2ea491b711a3946 Mon Sep 17 00:00:00 2001 From: Michał Górny Date: Thu, 25 Apr 2019 15:08:36 +0200 Subject: openpgp: Also handle EBUSY for NFS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michał Górny --- gemato/openpgp.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gemato/openpgp.py b/gemato/openpgp.py index 6232ae0..2f01a9e 100644 --- a/gemato/openpgp.py +++ b/gemato/openpgp.py @@ -223,12 +223,13 @@ disable-scdaemon def _rmtree_error_handler(func, path, exc_info): # ignore ENOENT -- it probably means a race condition between # us and gpg-agent cleaning up after itself - # also non-empty directory due to races: + # also non-empty directory due to races, and EBUSY for NFS: # https://bugs.gentoo.org/684172 if (not isinstance(exc_info[1], OSError) or exc_info[1].errno not in (errno.ENOENT, errno.ENOTEMPTY, - errno.EEXIST)): + errno.EEXIST, + errno.EBUSY)): raise exc_info[1] def close(self): -- cgit v1.2.3