diff options
| -rwxr-xr-x | bitbake/bin/bitbake-layers | 21 |
1 files changed, 13 insertions, 8 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index 62b51b0583..8cf7196c53 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
| @@ -719,18 +719,21 @@ build results (as the layer priority order has effectively changed). | |||
| 719 | Lists recipes with the bbappends that apply to them as subitems. | 719 | Lists recipes with the bbappends that apply to them as subitems. |
| 720 | """ | 720 | """ |
| 721 | self.init_bbhandler() | 721 | self.init_bbhandler() |
| 722 | if not self.bbhandler.cooker.collection.bbappends: | ||
| 723 | logger.plain('No append files found') | ||
| 724 | return 0 | ||
| 725 | 722 | ||
| 726 | logger.plain('=== Appended recipes ===') | 723 | logger.plain('=== Appended recipes ===') |
| 727 | 724 | ||
| 728 | pnlist = list(self.bbhandler.cooker_data.pkg_pn.keys()) | 725 | pnlist = list(self.bbhandler.cooker_data.pkg_pn.keys()) |
| 729 | pnlist.sort() | 726 | pnlist.sort() |
| 727 | appends = False | ||
| 730 | for pn in pnlist: | 728 | for pn in pnlist: |
| 731 | self.show_appends_for_pn(pn) | 729 | if self.show_appends_for_pn(pn): |
| 730 | appends = True | ||
| 731 | |||
| 732 | if self.show_appends_for_skipped(): | ||
| 733 | appends = True | ||
| 732 | 734 | ||
| 733 | self.show_appends_for_skipped() | 735 | if not appends: |
| 736 | logger.plain('No append files found') | ||
| 734 | 737 | ||
| 735 | def show_appends_for_pn(self, pn): | 738 | def show_appends_for_pn(self, pn): |
| 736 | filenames = self.bbhandler.cooker_data.pkg_pn[pn] | 739 | filenames = self.bbhandler.cooker_data.pkg_pn[pn] |
| @@ -741,12 +744,12 @@ Lists recipes with the bbappends that apply to them as subitems. | |||
| 741 | self.bbhandler.cooker_data.pkg_pn) | 744 | self.bbhandler.cooker_data.pkg_pn) |
| 742 | best_filename = os.path.basename(best[3]) | 745 | best_filename = os.path.basename(best[3]) |
| 743 | 746 | ||
| 744 | self.show_appends_output(filenames, best_filename) | 747 | return self.show_appends_output(filenames, best_filename) |
| 745 | 748 | ||
| 746 | def show_appends_for_skipped(self): | 749 | def show_appends_for_skipped(self): |
| 747 | filenames = [os.path.basename(f) | 750 | filenames = [os.path.basename(f) |
| 748 | for f in self.bbhandler.cooker.skiplist.iterkeys()] | 751 | for f in self.bbhandler.cooker.skiplist.iterkeys()] |
| 749 | self.show_appends_output(filenames, None, " (skipped)") | 752 | return self.show_appends_output(filenames, None, " (skipped)") |
| 750 | 753 | ||
| 751 | def show_appends_output(self, filenames, best_filename, name_suffix = ''): | 754 | def show_appends_output(self, filenames, best_filename, name_suffix = ''): |
| 752 | appended, missing = self.get_appends_for_files(filenames) | 755 | appended, missing = self.get_appends_for_files(filenames) |
| @@ -760,7 +763,9 @@ Lists recipes with the bbappends that apply to them as subitems. | |||
| 760 | if best_filename in missing: | 763 | if best_filename in missing: |
| 761 | logger.warn('%s: missing append for preferred version', | 764 | logger.warn('%s: missing append for preferred version', |
| 762 | best_filename) | 765 | best_filename) |
| 763 | 766 | return True | |
| 767 | else: | ||
| 768 | return False | ||
| 764 | 769 | ||
| 765 | def get_appends_for_files(self, filenames): | 770 | def get_appends_for_files(self, filenames): |
| 766 | appended, notappended = [], [] | 771 | appended, notappended = [], [] |
