summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2010-07-26 11:50:21 +0200
committerRichard Purdie <rpurdie@linux.intel.com>2010-08-03 14:07:11 +0100
commitad8c5b61a44fee43e5c31579b6d6d0ca639c1bf4 (patch)
tree45b60242d99da6f3326233ff97eac4973ed0396a
parent0e3fc6dff27ca1ee5a7512f968c3f9d5cfc2da6d (diff)
downloadpoky-ad8c5b61a44fee43e5c31579b6d6d0ca639c1bf4.tar.gz
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 <rep.dot.nop@gmail.com> Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--bitbake/lib/bb/utils.py4
1 files changed, 2 insertions, 2 deletions
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"):
309 except Exception as e: 309 except Exception as e:
310 # split the text into lines again 310 # split the text into lines again
311 body = text.split('\n') 311 body = text.split('\n')
312 bb.msg.error(bb.msg.domain.Util, "Error in compiling python function in: ", realfile) 312 bb.msg.error(bb.msg.domain.Util, "Error in compiling python function in: %s" % (realfile))
313 bb.msg.error(bb.msg.domain.Util, "The lines leading to this error were:") 313 bb.msg.error(bb.msg.domain.Util, "The lines leading to this error were:")
314 bb.msg.error(bb.msg.domain.Util, "\t%d:%s:'%s'" % (e.lineno, e.__class__.__name__, body[e.lineno-1])) 314 bb.msg.error(bb.msg.domain.Util, "\t%d:%s:'%s'" % (e.lineno, e.__class__.__name__, body[e.lineno-1]))
315 315
@@ -476,7 +476,7 @@ def filter_environment(good_vars):
476 del os.environ[key] 476 del os.environ[key]
477 477
478 if len(removed_vars): 478 if len(removed_vars):
479 bb.msg.debug(1, bb.msg.domain.Util, "Removed the following variables from the environment:", ",".join(removed_vars)) 479 bb.msg.debug(1, bb.msg.domain.Util, "Removed the following variables from the environment: %s" % (", ".join(removed_vars)))
480 480
481 return removed_vars 481 return removed_vars
482 482