diff options
| author | Zac Medico <zmedico@gentoo.org> | 2011-08-06 04:09:51 -0700 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2011-08-06 04:09:51 -0700 |
| commit | 2c92ae3c7ddb903bcffe96046cebe8106439e86b (patch) | |
| tree | 40678b16152a647da9b78fd1767e1576abd59fae /pym | |
| parent | 0db6b43feed351aaa47554f51bf46aa18a5009cc (diff) | |
| download | portage-2c92ae3c7ddb903bcffe96046cebe8106439e86b.tar.gz portage-2c92ae3c7ddb903bcffe96046cebe8106439e86b.tar.bz2 portage-2c92ae3c7ddb903bcffe96046cebe8106439e86b.zip | |
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.
Diffstat (limited to 'pym')
| -rw-r--r-- | pym/portage/dbapi/vartree.py | 6 |
1 files changed, 5 insertions, 1 deletions
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: |