From 2c92ae3c7ddb903bcffe96046cebe8106439e86b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 6 Aug 2011 04:09:51 -0700 Subject: 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. --- pym/portage/dbapi/vartree.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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: -- cgit v1.2.3-1-g7c22