bitbake/bin/bitbake:

   Rework handling of pkg_pn. I still wonder if we should
   set pkg_pn[pn] at all in this method.

   Patch courtsey proti

diff --git a/bin/bitbake b/bin/bitbake
index ecc4332..16ea1ae 100755 (executable)
--- a/bin/bitbake
+++ b/bin/bitbake
@@ -262,7 +262,7 @@ class BBCooker:
         p_list.sort(lambda a, b: a - b)
         tmp_pn = []
         for p in p_list:
-            tmp_pn = [priorities[p]] + tmp_pn
+            tmp_pn = priorities[p] + tmp_pn
         pkg_pn[pn] = tmp_pn
 
         preferred_file = None
@@ -276,14 +276,11 @@ class BBCooker:
             else:
                 preferred_r = None
 
-            for file_set in pkg_pn[pn]:
-                for f in file_set:
-                    pv,pr = self.status.pkg_pvpr[f]
-                    if preferred_v == pv and (preferred_r == pr or preferred_r == None):
-                        preferred_file = f
-                        preferred_ver = (pv, pr)
-                        break
-                if preferred_file:
+            for f in pkg_pn[pn]:
+                pv,pr = self.status.pkg_pvpr[f]
+                if preferred_v == pv and (preferred_r == pr or preferred_r == None):
+                    preferred_file = f
+                    preferred_ver = (pv, pr)
                     break
             if preferred_r:
                 pv_str = '%s-%s' % (preferred_v, preferred_r)
@@ -295,7 +292,7 @@ class BBCooker:
                 bb.debug(1, "selecting %s as PREFERRED_VERSION %s of package %s" % (preferred_file, pv_str, pn))
 
         # get highest priority file set
-        files = pkg_pn[pn][0]
+        files = pkg_pn[pn]
         latest = None
         latest_p = 0
         latest_f = None