summaryrefslogtreecommitdiff
path: root/morphlib/buildcommand.py
diff options
context:
space:
mode:
authorTiago Gomes <tiago.gomes@codethink.co.uk>2015-08-03 10:03:29 +0000
committerBaserock Gerrit <gerrit@baserock.org>2015-09-01 08:25:24 +0000
commit0b50b9ceca5fc604550537297e786d876d28508a (patch)
treecdc599c2e293ff8269e612c8b265648c9ac505d1 /morphlib/buildcommand.py
parent41cbcdf6b5c0f823ac5589faaf6da3651ad69dab (diff)
downloadmorph-0b50b9ceca5fc604550537297e786d876d28508a.tar.gz
Stop moving staging areas of failed builds
Stop moving staging areas of failed builds from the 'staging' directory to the 'failed' directory. Moving staging areas make it very difficult to debug build failures on the build essential chunks, as the paths set on the configure scripts and some environment variables (e.g. STAGE2_SYSROOT, DESTDIR) will be invalid after moving the staging area. This change will also make it easier to create scripts that chroot n environment similiar to the one where the build failure occurred. To make it still possible to safely do a build an run `morph gc` in parallel, we use flock(2) to control access to the staging area directory. Also, move the `test_supports_non_isolated_mode` test into a different class, as it requires a different SetUp() routine (the staging area is contructed with different parameters). Change-Id: I06c3c435ad05c12afabc0adc2a9d4f8a284ccc02
Diffstat (limited to 'morphlib/buildcommand.py')
-rw-r--r--morphlib/buildcommand.py6
1 files changed, 1 insertions, 5 deletions
diff --git a/morphlib/buildcommand.py b/morphlib/buildcommand.py
index 46c3104f..3ace34bd 100644
--- a/morphlib/buildcommand.py
+++ b/morphlib/buildcommand.py
@@ -366,11 +366,7 @@ class BuildCommand(object):
use_chroot,
extra_env=extra_env,
extra_path=extra_path)
- try:
- self.install_dependencies(staging_area, deps, source)
- except BaseException:
- staging_area.abort()
- raise
+ self.install_dependencies(staging_area, deps, source)
else:
staging_area = self.create_staging_area(build_env, False)