Ignore ENOTDIR from unmerge unlink calls. (trunk r7856)

svn path=/main/branches/2.1.2/; revision=7857

diff --git a/pym/portage.py b/pym/portage.py
index ef8c558938a61be5f6d5d3fdb8740edc16dac317..14d3e60d0cd548a8e82033bc947ceba8d559a9f9 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -7468,7 +7468,7 @@ class dblink:
 
                        #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):