aboutsummaryrefslogtreecommitdiff
path: root/gentoo
diff options
context:
space:
mode:
authorwiktor w brodlo <wiktor@brodlo.net>2011-07-11 17:30:17 +0000
committerwiktor w brodlo <wiktor@brodlo.net>2011-07-11 17:30:17 +0000
commit3e919e14f9d35b590e4be7aa40a1ecec3d36293c (patch)
tree84d3218d2e35b2fdb65d95e3feb90a3d21891e08 /gentoo
parentgentoo/utils.py: also install xterm if installing Xorg, useful (diff)
downloadanaconda-3e919e14f9d35b590e4be7aa40a1ecec3d36293c.tar.gz
anaconda-3e919e14f9d35b590e4be7aa40a1ecec3d36293c.tar.bz2
anaconda-3e919e14f9d35b590e4be7aa40a1ecec3d36293c.zip
Copy the emerge-fail log
Diffstat (limited to 'gentoo')
-rw-r--r--gentoo/livecd.py2
-rw-r--r--gentoo/utils.py7
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"]