From c67b95955d023c1f198531b4f06100a40b05efa7 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Fri, 10 Dec 2010 09:20:29 -0700 Subject: [PATCH] base: use bb.plain, not print for build_summary Signed-off-by: Chris Larson --- classes/base.bbclass | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/classes/base.bbclass b/classes/base.bbclass index 7f58b179e0..ac0f388e9c 100644 --- a/classes/base.bbclass +++ b/classes/base.bbclass @@ -233,24 +233,24 @@ python base_do_unpack() { } python build_summary() { - from bb import note, error, data - from bb.event import getName - - if isinstance(e, bb.event.BuildStarted): - bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) - statusvars = bb.data.getVar("BUILDCFG_VARS", e.data, 1).split() - statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] - statusmsg = "\n%s\n%s\n" % (bb.data.getVar("BUILDCFG_HEADER", e.data, 1), "\n".join(statuslines)) - print statusmsg - - needed_vars = bb.data.getVar("BUILDCFG_NEEDEDVARS", e.data, 1).split() - pesteruser = [] - for v in needed_vars: - val = bb.data.getVar(v, e.data, 1) - if not val or val == 'INVALID': - pesteruser.append(v) - if pesteruser: - bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) + from bb import note, error, data + from bb.event import getName + + if isinstance(e, bb.event.BuildStarted): + bb.data.setVar( 'BB_VERSION', bb.__version__, e.data ) + statusvars = bb.data.getVar("BUILDCFG_VARS", e.data, 1).split() + statuslines = ["%-17s = \"%s\"" % (i, bb.data.getVar(i, e.data, 1) or '') for i in statusvars] + statusmsg = "\n%s\n%s\n" % (bb.data.getVar("BUILDCFG_HEADER", e.data, 1), "\n".join(statuslines)) + bb.plain(statusmsg) + + needed_vars = bb.data.getVar("BUILDCFG_NEEDEDVARS", e.data, 1).split() + pesteruser = [] + for v in needed_vars: + val = bb.data.getVar(v, e.data, 1) + if not val or val == 'INVALID': + pesteruser.append(v) + if pesteruser: + bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) } addhandler build_summary -- 2.39.5