From: Zac Medico <zmedico@gentoo.org>
Date: Sat, 6 Aug 2011 11:09:51 +0000 (-0700)
Subject: unmerge: remove more info dir files for #323213
X-Git-Tag: v2.2.0_alpha51~10
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2c92ae3c7ddb903bcffe96046cebe8106439e86b;p=portage.git

unmerge: remove more info dir files for #323213

Treat any directory named "info" as a candidate here, since it might
have been in INFOPATH previously even though it may not be there now.
---

diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 94b7936e5..7f7873bd4 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -2220,7 +2220,11 @@ class dblink(object):
 			mydirs.reverse()
 
 			for obj, inode_key in mydirs:
-				if inode_key in infodirs_inodes:
+				# Treat any directory named "info" as a candidate here,
+				# since it might have been in INFOPATH previously even
+				# though it may not be there now.
+				if inode_key in infodirs_inodes or \
+					os.path.basename(obj) == "info":
 					try:
 						remaining = os.listdir(obj)
 					except OSError: