summaryrefslogtreecommitdiff
path: root/morphlib/stagingarea.py
diff options
context:
space:
mode:
authorRichard Maw <richard.maw@codethink.co.uk>2012-05-29 17:18:46 +0000
committerRichard Maw <richard.maw@codethink.co.uk>2012-05-30 13:11:13 +0100
commitb088e31b740c62b90ddf9c3342b876736790c1e8 (patch)
treeb73ea9c49d130c584c50c3b8c55f755f5cfa6d4a /morphlib/stagingarea.py
parent34817d54a193c6c0937ef3868f31d822e90aa740 (diff)
downloadmorph-b088e31b740c62b90ddf9c3342b876736790c1e8.tar.gz
morph: remove dead code and replace Execute with app.runcmd
Diffstat (limited to 'morphlib/stagingarea.py')
-rw-r--r--morphlib/stagingarea.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/morphlib/stagingarea.py b/morphlib/stagingarea.py
index e4d233f0..f3be5209 100644
--- a/morphlib/stagingarea.py
+++ b/morphlib/stagingarea.py
@@ -36,7 +36,8 @@ class StagingArea(object):
'''
- def __init__(self, dirname, tempdir):
+ def __init__(self, app, dirname, tempdir):
+ self._app = app
self.dirname = dirname
self.tempdir = tempdir
@@ -104,7 +105,6 @@ class StagingArea(object):
def runcmd(self, argv, **kwargs): # pragma: no cover
'''Run a command in a chroot in the staging area.'''
- ex = morphlib.execute.Execute('/', logging.debug)
cwd = kwargs.get('cwd') or '/'
if 'cwd' in kwargs:
cwd = kwargs['cwd']
@@ -113,5 +113,5 @@ class StagingArea(object):
cwd = '/'
real_argv = ['chroot', self.dirname, 'sh', '-c',
'cd "$1" && shift && exec "$@"', '--', cwd] + argv
- return ex.runv(real_argv, **kwargs)
+ return self._app.runcmd(real_argv, **kwargs)