From b088e31b740c62b90ddf9c3342b876736790c1e8 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Tue, 29 May 2012 17:18:46 +0000 Subject: morph: remove dead code and replace Execute with app.runcmd --- morphlib/stagingarea.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'morphlib/stagingarea.py') 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) -- cgit v1.2.1