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 1PuWlE-0003nH-5f for garchives@archives.gentoo.org; Tue, 01 Mar 2011 21:05:36 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 997051C0A7; Tue, 1 Mar 2011 21:05:29 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 69EC61C0A7 for ; Tue, 1 Mar 2011 21:05:29 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C2222654CD for ; Tue, 1 Mar 2011 21:05:28 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 22B0A8006A for ; Tue, 1 Mar 2011 21:05:28 +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: 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: fbf86c5d46eafa07a39a18b87cf185486875d294 Date: Tue, 1 Mar 2011 21:05:28 +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: 11a509d353f7076cb51b12867e41f174 commit: fbf86c5d46eafa07a39a18b87cf185486875d294 Author: Zac Medico gentoo org> AuthorDate: Tue Mar 1 21:04:41 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Tue Mar 1 21:04:41 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfbf86c5d owners_cache: fix EPREFIX miscalculation This reverts commit 43e0b3ea4289aab9b4258d29d06afac40abd6c01 and renames the root_len variable to eroot_len (for clarity). --- pym/portage/dbapi/vartree.py | 8 +++----- 1 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py index 845a5c3..af3b5d9 100644 --- a/pym/portage/dbapi/vartree.py +++ b/pym/portage/dbapi/vartree.py @@ -815,11 +815,9 @@ class vardbapi(dbapi): =20 def __init__(self, vardb): self._vardb =3D vardb - self._eprefix_split_len =3D len(x for x in \ - vardb.settings["EPREFIX"].split(os.sep) if x) =20 def add(self, cpv): - root_len =3D len(self._vardb._eroot) + eroot_len =3D len(self._vardb._eroot) contents =3D self._vardb._dblink(cpv).getcontents() pkg_hash =3D self._hash_pkg(cpv) if not contents: @@ -831,12 +829,12 @@ class vardbapi(dbapi): # explicitly listed in CONTENTS. added_paths =3D set() for x in contents: - x =3D x[root_len:] + x =3D x[eroot_len:] added_paths.add(x) self._add_path(x, pkg_hash) x_split =3D x.split(os.sep) x_split.pop() - while len(x_split) > self._eprefix_split_len: + while x_split: parent =3D os.sep.join(x_split) if parent in added_paths: break