summaryrefslogtreecommitdiffstats
path: root/bitbake
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2011-06-29 19:37:41 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-05 13:36:53 +0100
commitdeb14487d1267afbbcb6796035926470cd8152d7 (patch)
treeeaac5e865d2aef157a590ffc46b667671d4737c6 /bitbake
parent1164b7698313c5dcdc2aa3c65c35e2e1903286c6 (diff)
downloadpoky-deb14487d1267afbbcb6796035926470cd8152d7.tar.gz
bitbake-layers: fix sorting of show_appends output
Sort packages alphabetically but ensure appends are left in their original order (layer priority). (Bitbake rev: edacf98cceb2fe1275042595d3fce6822fa411ca) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bitbake')
-rwxr-xr-xbitbake/bin/bitbake-layers10
1 files changed, 6 insertions, 4 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers
index 110e3c8ee5..dfbdb7032a 100755
--- a/bitbake/bin/bitbake-layers
+++ b/bitbake/bin/bitbake-layers
@@ -149,7 +149,9 @@ class Commands(cmd.Cmd):
149 149
150 logger.info('State of append files:') 150 logger.info('State of append files:')
151 151
152 for pn in self.cooker_data.pkg_pn: 152 pnlist = list(self.cooker_data.pkg_pn.keys())
153 pnlist.sort( key=lambda item: item.pn )
154 for pn in pnlist:
153 self.show_appends_for_pn(pn) 155 self.show_appends_for_pn(pn)
154 156
155 self.show_appends_for_skipped() 157 self.show_appends_for_skipped()
@@ -188,7 +190,7 @@ class Commands(cmd.Cmd):
188 190
189 191
190 def get_appends_for_files(self, filenames): 192 def get_appends_for_files(self, filenames):
191 appended, notappended = set(), set() 193 appended, notappended = [], []
192 for filename in filenames: 194 for filename in filenames:
193 _, cls = bb.cache.Cache.virtualfn2realfn(filename) 195 _, cls = bb.cache.Cache.virtualfn2realfn(filename)
194 if cls: 196 if cls:
@@ -197,9 +199,9 @@ class Commands(cmd.Cmd):
197 basename = os.path.basename(filename) 199 basename = os.path.basename(filename)
198 appends = self.cooker_data.appends.get(basename) 200 appends = self.cooker_data.appends.get(basename)
199 if appends: 201 if appends:
200 appended.add((basename, frozenset(appends))) 202 appended.append((basename, list(appends)))
201 else: 203 else:
202 notappended.add(basename) 204 notappended.append(basename)
203 return appended, notappended 205 return appended, notappended
204 206
205 def show_appends_with_no_recipes(self): 207 def show_appends_with_no_recipes(self):