summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Larson <chris_larson@mentor.com>2011-01-04 13:06:49 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-01-06 10:49:01 +0000
commit1204ed79fce14115b802012772be8cf8aedff781 (patch)
tree78acc5ef19ad70eb7048acbad4033d7e8d554772
parent74653168c08f4a3cee86e37e8f805ca3d4365e1a (diff)
downloadpoky-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>
-rw-r--r--bitbake/lib/bb/parse/ast.py11
-rw-r--r--bitbake/lib/bb/process.py6
2 files changed, 6 insertions, 11 deletions
diff --git a/bitbake/lib/bb/parse/ast.py b/bitbake/lib/bb/parse/ast.py
index 55ab485990..fe2674d432 100644
--- a/bitbake/lib/bb/parse/ast.py
+++ b/bitbake/lib/bb/parse/ast.py
@@ -260,11 +260,11 @@ class BBHandlerNode(AstNode):
260 bb.data.setVar('__BBHANDLERS', bbhands, data) 260 bb.data.setVar('__BBHANDLERS', bbhands, data)
261 261
262class InheritNode(AstNode): 262class InheritNode(AstNode):
263 def __init__(self, files): 263 def __init__(self, classes):
264 self.n = __word__.findall(files) 264 self.classes = classes
265 265
266 def eval(self, data): 266 def eval(self, data):
267 bb.parse.BBHandler.inherit(self.n, data) 267 bb.parse.BBHandler.inherit(self.classes, data)
268 268
269def handleInclude(statements, m, fn, lineno, force): 269def handleInclude(statements, m, fn, lineno, force):
270 statements.append(IncludeNode(m.group(1), fn, lineno, force)) 270 statements.append(IncludeNode(m.group(1), fn, lineno, force))
@@ -300,9 +300,8 @@ def handleBBHandlers(statements, m):
300 statements.append(BBHandlerNode(m.group(1))) 300 statements.append(BBHandlerNode(m.group(1)))
301 301
302def handleInherit(statements, m): 302def handleInherit(statements, m):
303 files = m.group(1) 303 classes = m.group(1)
304 n = __word__.findall(files) 304 statements.append(InheritNode(__word__.findall(classes)))
305 statements.append(InheritNode(m.group(1)))
306 305
307def finalize(fn, d, variant = None): 306def finalize(fn, d, variant = None):
308 for lazykey in bb.data.getVar("__lazy_assigned", d) or (): 307 for lazykey in bb.data.getVar("__lazy_assigned", d) or ():
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
87def run(cmd, input=None, **options): 87def 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: