summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/bb
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake/lib/bb')
-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 3c8572476c..4981daa420 100644
--- a/bitbake/lib/bb/__init__.py
+++ b/bitbake/lib/bb/__init__.py
@@ -67,7 +67,7 @@ if "BBDEBUG" in os.environ:
67 if level: 67 if level:
68 bb.msg.set_debug_level(level) 68 bb.msg.set_debug_level(level)
69 69
70if True or os.environ.get("BBFETCH2"): 70if os.environ.get("BBFETCH2"):
71 from bb import fetch2 as fetch 71 from bb import fetch2 as fetch
72 sys.modules['bb.fetch'] = sys.modules['bb.fetch2'] 72 sys.modules['bb.fetch'] = sys.modules['bb.fetch2']
73 73
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):
193 if lineno == IN_PYTHON_EOF: 193 if lineno == IN_PYTHON_EOF:
194 return 194 return
195 195
196
197 if s and s[0] == '#': 196 if s and s[0] == '#':
198 if len(__residue__) != 0 and __residue__[0][0] != "#": 197 if len(__residue__) != 0 and __residue__[0][0] != "#":
199 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)) 198 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))