Ignore ENOTDIR from unmerge unlink calls.

svn path=/main/trunk/; revision=7856

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index fda5a2278820ee48009b5b1ddc0c3b40138910cf..f3b806ea5b4346dc065830e249c7b69259f36306 100644 (file)
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -1184,7 +1184,7 @@ class dblink(object):
 
                        #process symlinks second-to-last, directories last.
                        mydirs = []
-                       ignored_unlink_errnos = (errno.ENOENT, errno.EISDIR)
+                       ignored_unlink_errnos = (errno.ENOENT, errno.ENOTDIR, errno.EISDIR)
                        modprotect = os.path.join(self.vartree.root, "lib/modules/")
 
                        def unlink(file_name, lstatobj):