diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2011-06-29 19:37:41 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-05 13:25:11 +0100 |
commit | edacf98cceb2fe1275042595d3fce6822fa411ca (patch) | |
tree | 5b330b8649709e6e155c5f7a8cc204018897029e /bin | |
parent | 296c83cc22ce281223fe91ef84bc89034cd141e7 (diff) | |
download | bitbake-edacf98cceb2fe1275042595d3fce6822fa411ca.tar.gz |
bitbake-layers: fix sorting of show_appends output
Sort packages alphabetically but ensure appends are left in their
original order (layer priority).
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'bin')
-rwxr-xr-x | bin/bitbake-layers | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/bin/bitbake-layers b/bin/bitbake-layers index 110e3c8ee..dfbdb7032 100755 --- a/bin/bitbake-layers +++ b/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): |