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 <gentoo-commits+bounces-361888-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QgKfe-0001df-Rc
for garchives@archives.gentoo.org; Mon, 11 Jul 2011 17:53:26 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id EEF1921C04C;
Mon, 11 Jul 2011 17:53:19 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id BAF2021C04C
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Jul 2011 17:53:19 +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 2779B2AC1BB
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Jul 2011 17:53:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 72DC280040
for <gentoo-commits@lists.gentoo.org>; Mon, 11 Jul 2011 17:53:18 +0000 (UTC)
From: "Wiktor W Brodlo" <wiktor@brodlo.net>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Wiktor W Brodlo" <wiktor@brodlo.net>
Message-ID: <3e919e14f9d35b590e4be7aa40a1ecec3d36293c.wiktor@gentoo>
Subject: [gentoo-commits] proj/anaconda:master commit in: gentoo/
X-VCS-Repository: proj/anaconda
X-VCS-Files: gentoo/livecd.py gentoo/utils.py
X-VCS-Directories: gentoo/
X-VCS-Committer: wiktor
X-VCS-Committer-Name: Wiktor W Brodlo
X-VCS-Revision: 3e919e14f9d35b590e4be7aa40a1ecec3d36293c
Date: Mon, 11 Jul 2011 17:53:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 27250da87a1957750dce9ffecf43e94f
commit: 3e919e14f9d35b590e4be7aa40a1ecec3d36293c
Author: wiktor w brodlo <wiktor <AT> brodlo <DOT> net>
AuthorDate: Mon Jul 11 17:30:17 2011 +0000
Commit: Wiktor W Brodlo <wiktor <AT> brodlo <DOT> net>
CommitDate: Mon Jul 11 17:30:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/anaconda.git;=
a=3Dcommit;h=3D3e919e14
Copy the emerge-fail log
---
gentoo/livecd.py | 2 +-
gentoo/utils.py | 7 +++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/gentoo/livecd.py b/gentoo/livecd.py
index 1ea10f1..eee802d 100644
--- a/gentoo/livecd.py
+++ b/gentoo/livecd.py
@@ -228,7 +228,7 @@ class LiveCDCopyBackend(backend.AnacondaBackend):
# copy log files into chroot
isys.sync()
config_files =3D ["/tmp/anaconda.log", "/tmp/lvmout", "/tmp/resi=
ze.out",
- "/tmp/program.log", "/tmp/storage.log"]
+ "/tmp/program.log", "/tmp/storage.log", "/tmp/emerge-fail.l=
og"]
install_dir =3D self._root + "/var/log/installer"
if not os.path.isdir(install_dir):
os.makedirs(install_dir)
diff --git a/gentoo/utils.py b/gentoo/utils.py
index b32e962..3858df1 100644
--- a/gentoo/utils.py
+++ b/gentoo/utils.py
@@ -270,10 +270,13 @@ class GentooInstall:
=20
def install_package(self, atom, match =3D None, silent =3D False, fe=
tch =3D False):
if not self._portage.install(atom):
+ log =3D open("/tmp/emerge-fail.log", "a")
+ log.writeln(atom+" failed to install, trying again with make=
-j1")
+ log.close()
os.environ["MAKEOPTS"] =3D "-j1"
if not self._portage.install(atom):
- log =3D open("/root/emerge-fail.log", "a")
- log.writeln(atom)
+ log =3D open("/tmp/emerge-fail.log", "a")
+ log.writeln(atom+" failed to install the second time :("=
)
log.close()
del os.environ["MAKEOPTS"]
=20