summaryrefslogtreecommitdiff
path: root/bitbake-dev
diff options
context:
space:
mode:
Diffstat (limited to 'bitbake-dev')
-rwxr-xr-xbitbake-dev/bin/bitdoc2
-rw-r--r--bitbake-dev/lib/bb/cooker.py7
2 files changed, 4 insertions, 5 deletions
diff --git a/bitbake-dev/bin/bitdoc b/bitbake-dev/bin/bitdoc
index 3bcc9b344..4940f660a 100755
--- a/bitbake-dev/bin/bitdoc
+++ b/bitbake-dev/bin/bitdoc
@@ -453,6 +453,8 @@ def main():
except bb.parse.ParseError:
bb.fatal( "Unable to parse %s" % config_file )
+ if isinstance(documentation, dict):
+ documentation = documentation[""]
# Assuming we've the file loaded now, we will initialize the 'tree'
doc = Documentation()
diff --git a/bitbake-dev/lib/bb/cooker.py b/bitbake-dev/lib/bb/cooker.py
index 06f3395d7..d19cef328 100644
--- a/bitbake-dev/lib/bb/cooker.py
+++ b/bitbake-dev/lib/bb/cooker.py
@@ -628,13 +628,10 @@ class BBCooker:
fn = self.matchFile(buildfile)
self.buildSetVars()
- # Load data into the cache for fn
+ # Load data into the cache for fn and parse the loaded cache data
self.bb_cache = bb.cache.init(self)
- self.bb_cache.loadData(fn, self.configuration.data)
-
- # Parse the loaded cache data
self.status = bb.cache.CacheData()
- self.bb_cache.handle_data(fn, self.status)
+ self.bb_cache.loadData(fn, self.configuration.data, self.status)
# Tweak some variables
item = self.bb_cache.getVar('PN', fn, True)