]> code.ossystems Code Review - openembedded-core.git/commitdiff
utils: Fix number of arguments to bb.msg functions
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Mon, 26 Jul 2010 09:50:21 +0000 (11:50 +0200)
committerRichard Purdie <rpurdie@linux.intel.com>
Tue, 3 Aug 2010 13:07:11 +0000 (14:07 +0100)
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>
bitbake/lib/bb/utils.py

index c0cc9c6ea214dbdcd677b362e4dbabc77d1ba81c..665ffff45a2541b67ea6376114e3cbfa3e8cf677 100644 (file)
@@ -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