diff options
author | Chris Larson <chris_larson@mentor.com> | 2011-01-04 13:06:49 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-01-06 10:49:01 +0000 |
commit | 1204ed79fce14115b802012772be8cf8aedff781 (patch) | |
tree | 78acc5ef19ad70eb7048acbad4033d7e8d554772 /bitbake/lib/bb/process.py | |
parent | 74653168c08f4a3cee86e37e8f805ca3d4365e1a (diff) | |
download | poky-1204ed79fce14115b802012772be8cf8aedff781.tar.gz |
parse.ast: avoid code duplication for inherit
(Bitbake rev: 0b11a3d4eab84b372fd45b9537cf0327008daf8d)
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib/bb/process.py')
-rw-r--r-- | bitbake/lib/bb/process.py | 6 |
1 files changed, 1 insertions, 5 deletions
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): | |||
84 | log.write(data) | 84 | log.write(data) |
85 | return ''.join(outdata), ''.join(errdata) | 85 | return ''.join(outdata), ''.join(errdata) |
86 | 86 | ||
87 | def run(cmd, input=None, **options): | 87 | def run(cmd, input=None, log=None, **options): |
88 | """Convenience function to run a command and return its output, raising an | 88 | """Convenience function to run a command and return its output, raising an |
89 | exception when the command fails""" | 89 | exception when the command fails""" |
90 | 90 | ||
91 | if isinstance(cmd, basestring) and not "shell" in options: | 91 | if isinstance(cmd, basestring) and not "shell" in options: |
92 | options["shell"] = True | 92 | options["shell"] = True |
93 | 93 | ||
94 | log = options.get('log') | ||
95 | if 'log' in options: | ||
96 | del options['log'] | ||
97 | |||
98 | try: | 94 | try: |
99 | pipe = Popen(cmd, **options) | 95 | pipe = Popen(cmd, **options) |
100 | except OSError, exc: | 96 | except OSError, exc: |