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 1SS21Y-0002Oq-El for garchives@archives.gentoo.org; Wed, 09 May 2012 08:13:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 119D3E0534; Wed, 9 May 2012 08:13:17 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id D27DBE0534 for ; Wed, 9 May 2012 08:13:17 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3E16F1B4045 for ; Wed, 9 May 2012 08:13:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 04B8AE542D for ; Wed, 9 May 2012 08:13:16 +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: <1336551178.4fef960c0b3681ea5389e3a639ab1e30115c2021.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/package/ebuild/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/package/ebuild/doebuild.py X-VCS-Directories: pym/portage/package/ebuild/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 4fef960c0b3681ea5389e3a639ab1e30115c2021 X-VCS-Branch: master Date: Wed, 9 May 2012 08:13:16 +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: b79531b2-54fe-45a5-b042-ed9d0383cc15 X-Archives-Hash: 74677023655719add0909c1ccbe04e8a commit: 4fef960c0b3681ea5389e3a639ab1e30115c2021 Author: Zac Medico gentoo org> AuthorDate: Wed May 9 08:12:58 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Wed May 9 08:12:58 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D4fef960c doebuild_environment: remove unused eapi parsing --- pym/portage/package/ebuild/doebuild.py | 20 ++------------------ 1 files changed, 2 insertions(+), 18 deletions(-) diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package= /ebuild/doebuild.py index 4f7d4a8..53b7080 100644 --- a/pym/portage/package/ebuild/doebuild.py +++ b/pym/portage/package/ebuild/doebuild.py @@ -31,7 +31,7 @@ portage.proxy.lazyimport.lazyimport(globals(), =20 from portage import auxdbkeys, bsd_chflags, \ eapi_is_supported, merge, os, selinux, shutil, \ - unmerge, _encodings, _parse_eapi_ebuild_head, _os_merge, \ + unmerge, _encodings, _os_merge, \ _shell_quote, _unicode_decode, _unicode_encode from portage.const import EBUILD_SH_ENV_FILE, EBUILD_SH_ENV_DIR, \ EBUILD_SH_BINARY, INVALID_ENV_FILE, MISC_SH_BINARY @@ -335,27 +335,11 @@ def doebuild_environment(myebuild, mydo, myroot=3DN= one, settings=3DNone, # like PORTAGE_BUILDDIR are still initialized even in cases when # UnsupportedAPIException needs to be raised, which can be useful # when uninstalling a package that has corrupt EAPI metadata. - eapi =3D None - if mydo =3D=3D 'depend' and 'EAPI' not in mysettings.configdict['pkg']: - if eapi is None: - with io.open(_unicode_encode(ebuild_path, - encoding=3D_encodings['fs'], errors=3D'strict'), - mode=3D'r', encoding=3D_encodings['content'], - errors=3D'replace') as f: - eapi, eapi_lineno =3D _parse_eapi_ebuild_head(f) - if eapi is None: - eapi =3D "0" - - if eapi is not None: - if not eapi_is_supported(eapi): - _doebuild_path(mysettings) - raise UnsupportedAPIException(mycpv, eapi) - mysettings.configdict['pkg']['EAPI'] =3D eapi + eapi =3D mysettings.configdict['pkg'].get('EAPI') =20 if mydo !=3D "depend": # Metadata vars such as EAPI and RESTRICT are # set by the above config.setcpv() call. - eapi =3D mysettings["EAPI"] if not eapi_is_supported(eapi): # can't do anything with this. _doebuild_path(mysettings)