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 1Rymsa-0005kw-Gg for garchives@archives.gentoo.org; Sat, 18 Feb 2012 16:11:20 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 949BFE0F41; Sat, 18 Feb 2012 16:11:02 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 63D27E0F41 for ; Sat, 18 Feb 2012 16:11:02 +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 C0B641B4004 for ; Sat, 18 Feb 2012 16:11:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7B883E5400 for ; Sat, 18 Feb 2012 16:11:00 +0000 (UTC) From: "Thomas Sachau" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Thomas Sachau" Message-ID: <1329581446.5da82edbe654f78a6c7865ca87ac6d5b72c984ff.tommy@gentoo> Subject: [gentoo-commits] proj/portage:multilib commit in: bin/, pym/_emerge/ X-VCS-Repository: proj/portage X-VCS-Files: bin/auto-multilib.sh pym/_emerge/EbuildExecuter.py X-VCS-Directories: bin/ pym/_emerge/ X-VCS-Committer: tommy X-VCS-Committer-Name: Thomas Sachau X-VCS-Revision: 5da82edbe654f78a6c7865ca87ac6d5b72c984ff X-VCS-Branch: multilib Date: Sat, 18 Feb 2012 16:11:00 +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: 332669f2-de32-40ab-ba6b-83dbc1ee78e1 X-Archives-Hash: cd47569aad1b94af69656c0b484e7f3c commit: 5da82edbe654f78a6c7865ca87ac6d5b72c984ff Author: Thomas Sachau gentoo org> AuthorDate: Sat Feb 18 16:10:46 2012 +0000 Commit: Thomas Sachau gentoo org> CommitDate: Sat Feb 18 16:10:46 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D5da82edb Remove unused attributes --- bin/auto-multilib.sh | 6 +++++- pym/_emerge/EbuildExecuter.py | 8 ++++++-- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/bin/auto-multilib.sh b/bin/auto-multilib.sh index aa65d39..db49c52 100755 --- a/bin/auto-multilib.sh +++ b/bin/auto-multilib.sh @@ -124,7 +124,11 @@ get_abi_order() { fi =20 if [ -z "${order}" ]; then - die "Could not determine your profile ABI(s). Perhaps your USE flags = or MULTILIB_ABIS are too restrictive for this package or your profile doe= s not set DEFAULT_ABI." + if ! [ -z "${DEFAULT_ABI}" ]; then + order=3D${DEFAULT_ABI} + else + die "Could not determine your profile ABI(s). Perhaps your USE flags= or MULTILIB_ABIS are too restrictive for this package or your profile do= es not set DEFAULT_ABI." + fi fi =20 echo ${order} diff --git a/pym/_emerge/EbuildExecuter.py b/pym/_emerge/EbuildExecuter.p= y index b340f09..6591ee5 100644 --- a/pym/_emerge/EbuildExecuter.py +++ b/pym/_emerge/EbuildExecuter.py @@ -109,9 +109,13 @@ class EbuildExecuter(CompositeTask): # This initializes PORTAGE_LOG_FILE. portage.prepare_build_dirs(pkg.root, settings, cleanup) =20 + setup_phase =3D EbuildPhase(background=3Dself.background, + phase=3D"setup", scheduler=3Dscheduler, + settings=3Dsettings) + setup_phase =3D EbuildPhase(background=3Dself.background, - pkg=3Dpkg, phase=3D"setup", scheduler=3Dscheduler, - settings=3Dsettings, tree=3Dself) + phase=3D"setup", scheduler=3Dscheduler, + settings=3Dsettings) =20 setup_phase.addExitListener(self._setup_exit) self._current_task =3D setup_phase