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 1RFDeQ-0001tY-Rv for garchives@archives.gentoo.org; Sat, 15 Oct 2011 23:28:23 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0224A21C15B; Sat, 15 Oct 2011 23:28:15 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id C925321C15B for ; Sat, 15 Oct 2011 23:28:15 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3D0CF1B4033 for ; Sat, 15 Oct 2011 23:28:15 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 2D20A80042 for ; Sat, 15 Oct 2011 23:28:14 +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/EbuildMetadataPhase.py X-VCS-Directories: pym/_emerge/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: accfa9e43415d5fb54d98786859c444685ed1e4a Date: Sat, 15 Oct 2011 23:28:14 +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: 28651cdb30e994255dda8625d1f2c0b0 commit: accfa9e43415d5fb54d98786859c444685ed1e4a Author: Zac Medico gentoo org> AuthorDate: Sat Oct 15 23:28:04 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Oct 15 23:28:04 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Daccfa9e4 EbuildMetadataPhase: tweak metadata_callback usage For parse-eapi-ebuild-head, we want to assign self.metadata from the return value, for conformity with usage elsewhere. --- pym/_emerge/EbuildMetadataPhase.py | 5 ++--- 1 files changed, 2 insertions(+), 3 deletions(-) diff --git a/pym/_emerge/EbuildMetadataPhase.py b/pym/_emerge/EbuildMetad= ataPhase.py index 6ef7c00..2fbd29e 100644 --- a/pym/_emerge/EbuildMetadataPhase.py +++ b/pym/_emerge/EbuildMetadataPhase.py @@ -44,9 +44,8 @@ class EbuildMetadataPhase(SubProcess): =20 if eapi is not None: if not portage.eapi_is_supported(eapi): - self.metadata =3D {'EAPI' : eapi} - self.metadata_callback(self.cpv, - self.repo_path, self.metadata, self.ebuild_hash) + self.metadata =3D self.metadata_callback(self.cpv, + self.repo_path, {'EAPI' : eapi}, self.ebuild_hash) self._set_returncode((self.pid, os.EX_OK << 8)) self.wait() return