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 1Qfsth-0003Ul-MR for garchives@archives.gentoo.org; Sun, 10 Jul 2011 12:14:05 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1860A21C32E; Sun, 10 Jul 2011 12:13:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id DB21321C327 for ; Sun, 10 Jul 2011 12:13:56 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3FECC2AC13C for ; Sun, 10 Jul 2011 12:13:56 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 9F5398003D for ; Sun, 10 Jul 2011 12:13:55 +0000 (UTC) From: "Wiktor W Brodlo" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" Message-ID: <3a20588f83e42d64f3c15b07a00b944995beefc8.wiktor@gentoo> Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/ X-VCS-Repository: proj/anaconda X-VCS-Files: gentoo/utils.py X-VCS-Directories: gentoo/ X-VCS-Committer: wiktor X-VCS-Committer-Name: Wiktor W Brodlo X-VCS-Revision: 3a20588f83e42d64f3c15b07a00b944995beefc8 Date: Sun, 10 Jul 2011 12:13:55 +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: daff0ca5f15a61d7da0e57be345aba19 commit: 3a20588f83e42d64f3c15b07a00b944995beefc8 Author: wiktor w brodlo brodlo net> AuthorDate: Sun Jul 10 12:13:37 2011 +0000 Commit: Wiktor W Brodlo brodlo net> CommitDate: Sun Jul 10 12:13:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;= a=3Dcommit;h=3D3a20588f gentoo/utils.py: try handling some compilation errors --- gentoo/utils.py | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/gentoo/utils.py b/gentoo/utils.py index 2423b8d..4c2333b 100644 --- a/gentoo/utils.py +++ b/gentoo/utils.py @@ -269,12 +269,13 @@ class GentooInstall: # del self._settings[sys_settings_plg_id]['misc']['configprotects= kip'][:] =20 def install_package(self, atom, match =3D None, silent =3D False, fe= tch =3D False): - return self._portage.install(atom) - =20 - def install_masked_package(self, atom): - os.environ["ACCEPT_KEYWORDS"] =3D "~amd64 ~x86" - return self._portage.install(atom) - del os.environ["ACCEPT_KEYWORDS"] + if not self._portage.install(atom): + os.environ["MAKEOPTS"] =3D "-j1" + if not self._portage.install(atom): + log =3D open("/root/emerge-fail.log", "a") + log.writeln(atom) + log.close() + del os.environ["MAKEOPTS"] =20 # TODO: We don't remove anything from stage3 def remove_package(self, atom, match =3D None, silent =3D False):