diff options
| -rwxr-xr-x | bitbake/bin/bitbake-layers | 24 |
1 files changed, 19 insertions, 5 deletions
diff --git a/bitbake/bin/bitbake-layers b/bitbake/bin/bitbake-layers index d2ed5d49ca..6b5ad5a38b 100755 --- a/bitbake/bin/bitbake-layers +++ b/bitbake/bin/bitbake-layers | |||
| @@ -83,6 +83,8 @@ class Commands(cmd.Cmd): | |||
| 83 | for pn in self.cooker_data.pkg_pn: | 83 | for pn in self.cooker_data.pkg_pn: |
| 84 | self.show_appends_for_pn(pn) | 84 | self.show_appends_for_pn(pn) |
| 85 | 85 | ||
| 86 | self.show_appends_for_skipped() | ||
| 87 | |||
| 86 | self.show_appends_with_no_recipes() | 88 | self.show_appends_with_no_recipes() |
| 87 | 89 | ||
| 88 | def show_appends_for_pn(self, pn): | 90 | def show_appends_for_pn(self, pn): |
| @@ -94,17 +96,27 @@ class Commands(cmd.Cmd): | |||
| 94 | self.cooker_data.pkg_pn) | 96 | self.cooker_data.pkg_pn) |
| 95 | best_filename = os.path.basename(best[3]) | 97 | best_filename = os.path.basename(best[3]) |
| 96 | 98 | ||
| 99 | self.show_appends_output(filenames, best_filename) | ||
| 100 | |||
| 101 | def show_appends_for_skipped(self): | ||
| 102 | filenames = [os.path.basename(f) | ||
| 103 | for f in self.cooker.skiplist.iterkeys()] | ||
| 104 | self.show_appends_output(filenames, None, " (skipped)") | ||
| 105 | |||
| 106 | def show_appends_output(self, filenames, best_filename, name_suffix = ''): | ||
| 97 | appended, missing = self.get_appends_for_files(filenames) | 107 | appended, missing = self.get_appends_for_files(filenames) |
| 98 | if appended: | 108 | if appended: |
| 99 | for basename, appends in appended: | 109 | for basename, appends in appended: |
| 100 | logger.info('%s:', basename) | 110 | logger.info('%s%s:', basename, name_suffix) |
| 101 | for append in appends: | 111 | for append in appends: |
| 102 | logger.info(' %s', append) | 112 | logger.info(' %s', append) |
| 103 | 113 | ||
| 104 | if best_filename in missing: | 114 | if best_filename: |
| 105 | logger.warn('%s: missing append for preferred version', | 115 | if best_filename in missing: |
| 106 | best_filename) | 116 | logger.warn('%s: missing append for preferred version', |
| 107 | self.returncode |= 1 | 117 | best_filename) |
| 118 | self.returncode |= 1 | ||
| 119 | |||
| 108 | 120 | ||
| 109 | def get_appends_for_files(self, filenames): | 121 | def get_appends_for_files(self, filenames): |
| 110 | appended, notappended = set(), set() | 122 | appended, notappended = set(), set() |
| @@ -124,6 +136,8 @@ class Commands(cmd.Cmd): | |||
| 124 | def show_appends_with_no_recipes(self): | 136 | def show_appends_with_no_recipes(self): |
| 125 | recipes = set(os.path.basename(f) | 137 | recipes = set(os.path.basename(f) |
| 126 | for f in self.cooker_data.pkg_fn.iterkeys()) | 138 | for f in self.cooker_data.pkg_fn.iterkeys()) |
| 139 | recipes |= set(os.path.basename(f) | ||
| 140 | for f in self.cooker.skiplist.iterkeys()) | ||
| 127 | appended_recipes = self.cooker_data.appends.iterkeys() | 141 | appended_recipes = self.cooker_data.appends.iterkeys() |
| 128 | appends_without_recipes = [self.cooker_data.appends[recipe] | 142 | appends_without_recipes = [self.cooker_data.appends[recipe] |
| 129 | for recipe in appended_recipes | 143 | for recipe in appended_recipes |
