diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-05-14 16:03:25 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-05-14 16:03:25 +0000 |
| commit | 090ee65ba03ce50d0ec5dcd41ac77b377779c6ba (patch) | |
| tree | df8467348fbce7cd16afed78021d295d9bd363bf /morphlib/stagingarea.py | |
| parent | 949788092824768dc5ffd517073b5b94172869ee (diff) | |
| parent | ff04f9c2523c9a5d1e55481a43048b5728dafbe4 (diff) | |
| download | morph-090ee65ba03ce50d0ec5dcd41ac77b377779c6ba.tar.gz | |
Merge branch 'baserock/richardipsum/build-log-on-stdout-tee2'
Reviewed by:
Lars Wirzenius
Sam Thursfield
Daniel Silverstone
Diffstat (limited to 'morphlib/stagingarea.py')
| -rw-r--r-- | morphlib/stagingarea.py | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py index 61f9e660..124edabf 100644 --- a/morphlib/stagingarea.py +++ b/morphlib/stagingarea.py @@ -309,7 +309,14 @@ class StagingArea(object): real_argv += argv try: - return self._app.runcmd(real_argv, **kwargs) + if 'logfile' in kwargs and kwargs['logfile'] != None: + logfile = kwargs['logfile'] + del kwargs['logfile'] + + teecmd = ['tee', '-a', logfile] + return self._app.runcmd(real_argv, teecmd, **kwargs) + else: + return self._app.runcmd(real_argv, **kwargs) except cliapp.AppException as e: raise cliapp.AppException('In staging area %s: running ' 'command \'%s\' failed.' % |