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 1QP5Eg-0002gc-IX for garchives@archives.gentoo.org; Wed, 25 May 2011 03:58:18 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 837F91C014; Wed, 25 May 2011 03:58:11 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 552A01C014 for ; Wed, 25 May 2011 03:58:11 +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 96B711B400B for ; Wed, 25 May 2011 03:58:10 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E8B2F80505 for ; Wed, 25 May 2011 03:58:09 +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/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: pym/_emerge/FakeVartree.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: faa536f437c445c3d2eb06c791b1492101474cc9 Date: Wed, 25 May 2011 03:58:09 +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: d32c2c49a9c0f6e787e0cbcc39be92af commit: faa536f437c445c3d2eb06c791b1492101474cc9 Author: Zac Medico gentoo org> AuthorDate: Wed May 25 03:57:33 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 25 03:57:33 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Dfaa536f4 FakeVartree: preserve EAPI of installed package If the corresponding unbuilt ebuild has a different EAPI than the installed instance, then we want to preserve the EAPI meatadata from the installed instance. --- pym/_emerge/FakeVartree.py | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/pym/_emerge/FakeVartree.py b/pym/_emerge/FakeVartree.py index 3e81130..51683ca 100644 --- a/pym/_emerge/FakeVartree.py +++ b/pym/_emerge/FakeVartree.py @@ -92,7 +92,8 @@ class FakeVartree(vartree): repo =3D _gen_valid_repo(repo) live_metadata =3D dict(zip(self._portdb_keys, self._portdb.aux_get(pkg, self._portdb_keys, myrepo=3Drepo))) - if not portage.eapi_is_supported(live_metadata["EAPI"]): + if not portage.eapi_is_supported(live_metadata["EAPI"]) or \ + self._aux_get(pkg, ["EAPI"])[0] !=3D live_metadata["EAPI"]: raise KeyError(pkg) self.dbapi.aux_update(pkg, live_metadata) except (KeyError, portage.exception.PortageException):