diff options
| author | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-08-02 10:17:49 +0000 |
|---|---|---|
| committer | Pedro Alvarez <pedro.alvarez@codethink.co.uk> | 2016-08-02 10:51:13 +0000 |
| commit | 8d1d643108108ab29e8673c37dbe3dc8c5ecefeb (patch) | |
| tree | 83697801693fa39bc6d172ebed4727fab779ebf1 /morphlib/builder.py | |
| parent | 9fc92c1403e374d78712db852fb4342f770162fb (diff) | |
| download | morph-baserock/pedroalvarez/morph-not-failing.tar.gz | |
Revert "run commands in builder using -e"baserock/pedroalvarez/morph-not-failing
Some failing commands in a yaml block were being ignored. For
example the following commands...
pre-configure-commands:
- |
cp nonexistent foo
echo foo
... where giving the following result without making the build
fail:
### PRE-CONFIGURE-COMMANDS ###
+ cp nonexistent foo
cp: can't stat 'nonexistent': No such file or directory
+ echo foo
foo
This commit also adjusts the test-shell.c to allow the use of '-e'
flag. No other changes because the shell was already failing after
the first failure found.
Change-Id: Ie78b25a99f1b5d6d0d26be74ddc377025dff69fd
Diffstat (limited to 'morphlib/builder.py')
| -rw-r--r-- | morphlib/builder.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/morphlib/builder.py b/morphlib/builder.py index 0bac730c..1ad19d06 100644 --- a/morphlib/builder.py +++ b/morphlib/builder.py @@ -378,7 +378,7 @@ class ChunkBuilder(BuilderBase): stdout.flush() with open(os.devnull) as devnull: - exit_code = self.runcmd(['sh', '-x', '-c', cmd], + exit_code = self.runcmd(['sh', '-x', '-e', '-c', cmd], extra_env=extra_env, cwd=relative_builddir, stdin=devnull, |