[gentoo-commits] proj/anaconda:master commit in: gentoo/

["Wiktor W Brodlo" <wiktor@brodlo.net>]

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=proj/anaconda.git;a=commit;h=3e919e14

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 = ["/tmp/anaconda.log", "/tmp/lvmout", "/tmp/resize.out",
-             "/tmp/program.log", "/tmp/storage.log"]
+             "/tmp/program.log", "/tmp/storage.log", "/tmp/emerge-fail.log"]
         install_dir = 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:
 
     def install_package(self, atom, match = None, silent = False, fetch = False):
         if not self._portage.install(atom):
+            log = open("/tmp/emerge-fail.log", "a")
+            log.writeln(atom+" failed to install, trying again with make -j1")
+            log.close()
             os.environ["MAKEOPTS"] = "-j1"
             if not self._portage.install(atom):
-                log = open("/root/emerge-fail.log", "a")
-                log.writeln(atom)
+                log = open("/tmp/emerge-fail.log", "a")
+                log.writeln(atom+" failed to install the second time :(")
                 log.close()
             del os.environ["MAKEOPTS"]