diff options
| author |   Chris Larson <chris_larson@mentor.com> | 2011-04-04 14:37:59 -0700 |
|---|---|---|
| committer | Chris Larson <chris_larson@mentor.com> | 2011-04-04 14:43:54 -0700 |
| commit | a87dc5317ce8523d0602186c857622dfa28e5bc7 (patch) | |
| tree | a56cf95257e9f3f46a71ee4398f9c6890c848569 /lib | |
| parent | 8885b2597e76daf13bdb10cb4351283161c8aff3 (diff) | |
| download | bitbake-a87dc5317ce8523d0602186c857622dfa28e5bc7.tar.gz | |
cooker: fix -b with BBCLASSEXTEND
Signed-off-by: Chris Larson <chris_larson@mentor.com>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/cooker.py | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py index 70d1ae3ee..9d00c13a0 100644 --- a/lib/bb/cooker.py +++ b/lib/bb/cooker.py @@ -604,20 +604,23 @@ class BBCooker: if (task == None): task = self.configuration.cmd - (fn, cls) = bb.cache.Cache.virtualfn2realfn(buildfile) + fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) + fn = os.path.abspath(fn) buildfile = self.matchFile(fn) - fn = bb.cache.Cache.realfn2virtual(buildfile, cls) self.buildSetVars() self.status = bb.cache.CacheData() infos = bb.cache.Cache.parse(fn, self.get_file_appends(fn), \ self.configuration.data) - maininfo = None - for vfn, info in infos: - self.status.add_from_recipeinfo(vfn, info) - if vfn == fn: - maininfo = info + infos = dict(infos) + + fn = bb.cache.Cache.realfn2virtual(buildfile, cls) + try: + maininfo = infos[fn] + except KeyError: + bb.fatal("%s does not exist" % fn) + self.status.add_from_recipeinfo(fn, maininfo) # Tweak some variables item = maininfo.pn |