From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 27 Sep 2007 19:22:05 +0000 (-0000)
Subject: Ignore ENOTDIR from unmerge unlink calls.
X-Git-Tag: v2.2_pre1~765
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=17302506b585ea9e34b37758083b2c59e6577a7a;p=portage.git

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 fda5a2278..f3b806ea5 100644
--- 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):