diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 2614c4485a..48904a52d6 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -583,13 +583,12 @@ class BBCooker: | |||
583 | 583 | ||
584 | def showVersions(self): | 584 | def showVersions(self): |
585 | 585 | ||
586 | pkg_pn = self.recipecaches[''].pkg_pn | 586 | (latest_versions, preferred_versions) = self.findProviders() |
587 | (latest_versions, preferred_versions) = bb.providers.findProviders(self.data, self.recipecaches[''], pkg_pn) | ||
588 | 587 | ||
589 | logger.plain("%-35s %25s %25s", "Recipe Name", "Latest Version", "Preferred Version") | 588 | logger.plain("%-35s %25s %25s", "Recipe Name", "Latest Version", "Preferred Version") |
590 | logger.plain("%-35s %25s %25s\n", "===========", "==============", "=================") | 589 | logger.plain("%-35s %25s %25s\n", "===========", "==============", "=================") |
591 | 590 | ||
592 | for p in sorted(pkg_pn): | 591 | for p in sorted(self.recipecaches[''].pkg_pn): |
593 | pref = preferred_versions[p] | 592 | pref = preferred_versions[p] |
594 | latest = latest_versions[p] | 593 | latest = latest_versions[p] |
595 | 594 | ||
@@ -1084,6 +1083,20 @@ class BBCooker: | |||
1084 | if matches: | 1083 | if matches: |
1085 | bb.event.fire(bb.event.FilesMatchingFound(filepattern, matches), self.data) | 1084 | bb.event.fire(bb.event.FilesMatchingFound(filepattern, matches), self.data) |
1086 | 1085 | ||
1086 | def findProviders(self, mc=''): | ||
1087 | return bb.providers.findProviders(self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) | ||
1088 | |||
1089 | def findBestProvider(self, pn, mc=''): | ||
1090 | if pn in self.recipecaches[mc].providers: | ||
1091 | filenames = self.recipecaches[mc].providers[pn] | ||
1092 | eligible, foundUnique = bb.providers.filterProviders(filenames, pn, self.expanded_data, self.recipecaches[mc]) | ||
1093 | filename = eligible[0] | ||
1094 | return None, None, None, filename | ||
1095 | elif pn in self.recipecaches[mc].pkg_pn: | ||
1096 | return bb.providers.findBestProvider(pn, self.data, self.recipecaches[mc], self.recipecaches[mc].pkg_pn) | ||
1097 | else: | ||
1098 | return None, None, None, None | ||
1099 | |||
1087 | def findConfigFiles(self, varname): | 1100 | def findConfigFiles(self, varname): |
1088 | """ | 1101 | """ |
1089 | Find config files which are appropriate values for varname. | 1102 | Find config files which are appropriate values for varname. |