From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Sep 2007 19:24:03 +0000 (-0000)
Subject: Ignore ENOTDIR from unmerge unlink calls. (trunk r7856)
X-Git-Tag: v2.1.3.16~102
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=872b03870d21595abe64f5e558a82aa8a0b37797;p=portage.git

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 ef8c55893..14d3e60d0 100644
--- 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):