diff options
| author | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-25 12:31:15 +0100 |
|---|---|---|
| committer | Lars Wirzenius <lars.wirzenius@codethink.co.uk> | 2012-04-25 12:31:15 +0100 |
| commit | 422cf9cecaf7accbdd00913032123458b2d3d2db (patch) | |
| tree | a2e07f54fdd94a8c22a7f53436e93996d5479cfd /morphlib/stagingarea.py | |
| parent | 9dbeb052771e958cbaa8897b3d806a82b8bfdc32 (diff) | |
| download | morph-422cf9cecaf7accbdd00913032123458b2d3d2db.tar.gz | |
Log installed artifacts; do not log shell commands
The -x to sh didn't actually produce any output to help in my
debugging, so I remove it now.
Diffstat (limited to 'morphlib/stagingarea.py')
| -rw-r--r-- | morphlib/stagingarea.py | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py index 1d8b6ef1..a34daede 100644 --- a/morphlib/stagingarea.py +++ b/morphlib/stagingarea.py @@ -87,7 +87,9 @@ class StagingArea(object): the artifact is a tarball. ''' - + + logging.debug('Installing artifact %s' % + getattr(handle, 'name', 'unknown name')) tf = tarfile.open(fileobj=handle) tf.extractall(path=self.dirname) @@ -111,7 +113,7 @@ class StagingArea(object): del kwargs['cwd'] else: cwd = '/' - real_argv = ['/usr/sbin/chroot', self.dirname, 'sh', '-xc', + real_argv = ['/usr/sbin/chroot', self.dirname, 'sh', '-c', 'cd "$1" && shift && exec "$@"', '--', cwd] + argv return ex.runv(real_argv, **kwargs) |