summaryrefslogtreecommitdiffstats
path: root/bitbake/lib
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2011-10-11 16:25:29 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 14:11:30 +0100
commitbe9ee810bd00b74770b659fdc7da19c2166debee (patch)
tree15329b9c94e92778872467db94e154fc73dbdddd /bitbake/lib
parent0c05d53fbede6feed6e9d361cb631a364f045a0f (diff)
downloadast2050-yocto-poky-be9ee810bd00b74770b659fdc7da19c2166debee.zip
ast2050-yocto-poky-be9ee810bd00b74770b659fdc7da19c2166debee.tar.gz
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 <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake/lib')
-rw-r--r--bitbake/lib/bb/__init__.py2
-rw-r--r--bitbake/lib/bb/parse/parse_py/BBHandler.py1
2 files changed, 1 insertions, 2 deletions
diff --git a/bitbake/lib/bb/__init__.py b/bitbake/lib/bb/__init__.py
index 3c85724..4981daa 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 c59b468..851a7e6 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))
OpenPOWER on IntegriCloud