From be9ee810bd00b74770b659fdc7da19c2166debee Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 11 Oct 2011 16:25:29 +0800 Subject: Fix typos in local.conf.sample and local.conf.sample.extended Fixes bug [YOCTO #1667] Fix typos in local.conf.sample and local.conf.sample.extended: differernt -> different chages -> changes complation -> compilation egde -> edge "an an" -> "as an" images's -> image's Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- bitbake/lib/bb/__init__.py | 2 +- bitbake/lib/bb/parse/parse_py/BBHandler.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'bitbake') diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py index 3c8572476c..4981daa420 100644 --- a/bitbake/lib/bb/__init__.py +++ b/bitbake/lib/bb/__init__.py @@ -67,7 +67,7 @@ if "BBDEBUG" in os.environ: if level: bb.msg.set_debug_level(level) -if True or os.environ.get("BBFETCH2"): +if os.environ.get("BBFETCH2"): from bb import fetch2 as fetch sys.modules['bb.fetch'] = sys.modules['bb.fetch2'] diff --git a/bitbake/lib/bb/parse/parse_py/BBHandler.py b/bitbake/lib/bb/parse/parse_py/BBHandler.py index c59b468e0b..851a7e6698 100644 --- a/bitbake/lib/bb/parse/parse_py/BBHandler.py +++ b/bitbake/lib/bb/parse/parse_py/BBHandler.py @@ -193,7 +193,6 @@ def feeder(lineno, s, fn, root, statements): if lineno == IN_PYTHON_EOF: return - if s and s[0] == '#': if len(__residue__) != 0 and __residue__[0][0] != "#": bb.error("There is a comment on line %s of file %s (%s) which is in the middle of a multiline expression.\nBitbake used to ignore these but no longer does so, please fix your metadata as errors are likely as a result of this change." % (lineno, fn, s)) -- cgit v1.2.3-54-g00ecf