From 1204ed79fce14115b802012772be8cf8aedff781 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Tue, 4 Jan 2011 13:06:49 -0700 Subject: parse.ast: avoid code duplication for inherit (Bitbake rev: 0b11a3d4eab84b372fd45b9537cf0327008daf8d) Signed-off-by: Chris Larson Signed-off-by: Richard Purdie --- bitbake/lib/bb/process.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'bitbake/lib/bb/process.py') diff --git a/bitbake/lib/bb/process.py b/bitbake/lib/bb/process.py index fd7f28d7a0..808cd60f92 100644 --- a/bitbake/lib/bb/process.py +++ b/bitbake/lib/bb/process.py @@ -84,17 +84,13 @@ def _logged_communicate(pipe, log, input): log.write(data) return ''.join(outdata), ''.join(errdata) -def run(cmd, input=None, **options): +def run(cmd, input=None, log=None, **options): """Convenience function to run a command and return its output, raising an exception when the command fails""" if isinstance(cmd, basestring) and not "shell" in options: options["shell"] = True - log = options.get('log') - if 'log' in options: - del options['log'] - try: pipe = Popen(cmd, **options) except OSError, exc: -- cgit v1.2.3