From: Bernhard Reutner-Fischer Date: Mon, 26 Jul 2010 09:50:21 +0000 (+0200) Subject: utils: Fix number of arguments to bb.msg functions X-Git-Tag: 2011-1~5012 X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=ad8c5b61a44fee43e5c31579b6d6d0ca639c1bf4;p=openembedded-core.git utils: Fix number of arguments to bb.msg functions the 'fn' argument of them is not used, should be removed anytime: sed -i -e '/^def.*fn/s/,[[:space:]]*fn[[:space:]]*=[[:space:]]*None[[:space:]]*)/)/g' lib/bb/msg.py (Bitbake rev: 1cb72e371322c271ee7f2d008c6f7899fb38b4fd) Signed-off-by: Bernhard Reutner-Fischer Signed-off-by: Richard Purdie --- diff --git a/bitbake/lib/bb/utils.py b/bitbake/lib/bb/utils.py index c0cc9c6ea2..665ffff45a 100644 --- a/bitbake/lib/bb/utils.py +++ b/bitbake/lib/bb/utils.py @@ -309,7 +309,7 @@ def better_compile(text, file, realfile, mode = "exec"): except Exception as e: # split the text into lines again body = text.split('\n') - bb.msg.error(bb.msg.domain.Util, "Error in compiling python function in: ", realfile) + bb.msg.error(bb.msg.domain.Util, "Error in compiling python function in: %s" % (realfile)) bb.msg.error(bb.msg.domain.Util, "The lines leading to this error were:") bb.msg.error(bb.msg.domain.Util, "\t%d:%s:'%s'" % (e.lineno, e.__class__.__name__, body[e.lineno-1])) @@ -476,7 +476,7 @@ def filter_environment(good_vars): del os.environ[key] if len(removed_vars): - bb.msg.debug(1, bb.msg.domain.Util, "Removed the following variables from the environment:", ",".join(removed_vars)) + bb.msg.debug(1, bb.msg.domain.Util, "Removed the following variables from the environment: %s" % (", ".join(removed_vars))) return removed_vars