From: Chris Larson <chris_larson@mentor.com>
Date: Mon, 4 Apr 2011 21:37:59 +0000 (-0700)
Subject: cooker: fix -b with BBCLASSEXTEND
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58bdaeb679d3c84cda827a33d09ce543547c45b4;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

cooker: fix -b with BBCLASSEXTEND

Signed-off-by: Chris Larson <chris_larson@mentor.com>
---

diff --git a/lib/bb/cooker.py b/lib/bb/cooker.py
index b6b5934d272..d4415d324df 100644
--- a/lib/bb/cooker.py
+++ b/lib/bb/cooker.py
@@ -694,20 +694,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