From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1Qpelm-0008CH-7G for garchives@archives.gentoo.org; Sat, 06 Aug 2011 11:10:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8B9B621C03D; Sat, 6 Aug 2011 11:10:10 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 53C9821C03D for ; Sat, 6 Aug 2011 11:10:10 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BF1A71B400F for ; Sat, 6 Aug 2011 11:10:09 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id D954380040 for ; Sat, 6 Aug 2011 11:10:08 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <2c92ae3c7ddb903bcffe96046cebe8106439e86b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/dbapi/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/dbapi/vartree.py X-VCS-Directories: pym/portage/dbapi/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2c92ae3c7ddb903bcffe96046cebe8106439e86b Date: Sat, 6 Aug 2011 11:10:08 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 7e387f860f95f75552a4e4f4c72aa8f1 commit: 2c92ae3c7ddb903bcffe96046cebe8106439e86b Author: Zac Medico gentoo org> AuthorDate: Sat Aug 6 11:09:51 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Aug 6 11:09:51 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D2c92ae3c 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 files changed, 5 insertions(+), 1 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 94b7936..7f7873b 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -2220,7 +2220,11 @@ class dblink(object): mydirs.reverse() =20 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) =3D=3D "info": try: remaining =3D os.listdir(obj) except OSError: