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 94b7936e538d196378c559971f783f9e6472b0b8..7f7873bd4c492d9106eca48a53d559e51d951b35 100644 (file)
--- 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: