From deb14487d1267afbbcb6796035926470cd8152d7 Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 29 Jun 2011 19:37:41 +0100 Subject: 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 Signed-off-by: Richard Purdie --- bitbake/bin/bitbake-layers | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'bitbake/bin/bitbake-layers') 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): logger.info('State of append files:') - for pn in self.cooker_data.pkg_pn: + pnlist = list(self.cooker_data.pkg_pn.keys()) + pnlist.sort( key=lambda item: item.pn ) + for pn in pnlist: self.show_appends_for_pn(pn) self.show_appends_for_skipped() @@ -188,7 +190,7 @@ class Commands(cmd.Cmd): def get_appends_for_files(self, filenames): - appended, notappended = set(), set() + appended, notappended = [], [] for filename in filenames: _, cls = bb.cache.Cache.virtualfn2realfn(filename) if cls: @@ -197,9 +199,9 @@ class Commands(cmd.Cmd): basename = os.path.basename(filename) appends = self.cooker_data.appends.get(basename) if appends: - appended.add((basename, frozenset(appends))) + appended.append((basename, list(appends))) else: - notappended.add(basename) + notappended.append(basename) return appended, notappended def show_appends_with_no_recipes(self): -- cgit v1.2.3-54-g00ecf