diff options
Diffstat (limited to 'bitbake/lib/bb/providers.py')
-rw-r--r-- | bitbake/lib/bb/providers.py | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/bitbake/lib/bb/providers.py b/bitbake/lib/bb/providers.py index 058996ba57..58326f0398 100644 --- a/bitbake/lib/bb/providers.py +++ b/bitbake/lib/bb/providers.py | |||
@@ -62,7 +62,7 @@ def sortPriorities(pn, dataCache, pkg_pn = None): | |||
62 | def preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r): | 62 | def preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r): |
63 | """ | 63 | """ |
64 | Check if the version pe,pv,pr is the preferred one. | 64 | Check if the version pe,pv,pr is the preferred one. |
65 | If there is preferred version defined and ends with '%', then pv has to start with that version after removing the '%' | 65 | If there is preferred version defined and ends with '%', then pv has to start with that version after removing the '%' |
66 | """ | 66 | """ |
67 | if (pr == preferred_r or preferred_r == None): | 67 | if (pr == preferred_r or preferred_r == None): |
68 | if (pe == preferred_e or preferred_e == None): | 68 | if (pe == preferred_e or preferred_e == None): |
@@ -103,7 +103,7 @@ def findPreferredProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
103 | 103 | ||
104 | for file_set in pkg_pn: | 104 | for file_set in pkg_pn: |
105 | for f in file_set: | 105 | for f in file_set: |
106 | pe,pv,pr = dataCache.pkg_pepvpr[f] | 106 | pe, pv, pr = dataCache.pkg_pepvpr[f] |
107 | if preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r): | 107 | if preferredVersionMatch(pe, pv, pr, preferred_e, preferred_v, preferred_r): |
108 | preferred_file = f | 108 | preferred_file = f |
109 | preferred_ver = (pe, pv, pr) | 109 | preferred_ver = (pe, pv, pr) |
@@ -136,7 +136,7 @@ def findLatestProvider(pn, cfgData, dataCache, file_set): | |||
136 | latest_p = 0 | 136 | latest_p = 0 |
137 | latest_f = None | 137 | latest_f = None |
138 | for file_name in file_set: | 138 | for file_name in file_set: |
139 | pe,pv,pr = dataCache.pkg_pepvpr[file_name] | 139 | pe, pv, pr = dataCache.pkg_pepvpr[file_name] |
140 | dp = dataCache.pkg_dp[file_name] | 140 | dp = dataCache.pkg_dp[file_name] |
141 | 141 | ||
142 | if (latest is None) or ((latest_p == dp) and (utils.vercmp(latest, (pe, pv, pr)) < 0)) or (dp > latest_p): | 142 | if (latest is None) or ((latest_p == dp) and (utils.vercmp(latest, (pe, pv, pr)) < 0)) or (dp > latest_p): |
@@ -169,14 +169,14 @@ def findBestProvider(pn, cfgData, dataCache, pkg_pn = None, item = None): | |||
169 | 169 | ||
170 | def _filterProviders(providers, item, cfgData, dataCache): | 170 | def _filterProviders(providers, item, cfgData, dataCache): |
171 | """ | 171 | """ |
172 | Take a list of providers and filter/reorder according to the | 172 | Take a list of providers and filter/reorder according to the |
173 | environment variables and previous build results | 173 | environment variables and previous build results |
174 | """ | 174 | """ |
175 | eligible = [] | 175 | eligible = [] |
176 | preferred_versions = {} | 176 | preferred_versions = {} |
177 | sortpkg_pn = {} | 177 | sortpkg_pn = {} |
178 | 178 | ||
179 | # The order of providers depends on the order of the files on the disk | 179 | # The order of providers depends on the order of the files on the disk |
180 | # up to here. Sort pkg_pn to make dependency issues reproducible rather | 180 | # up to here. Sort pkg_pn to make dependency issues reproducible rather |
181 | # than effectively random. | 181 | # than effectively random. |
182 | providers.sort() | 182 | providers.sort() |
@@ -226,7 +226,7 @@ def _filterProviders(providers, item, cfgData, dataCache): | |||
226 | 226 | ||
227 | def filterProviders(providers, item, cfgData, dataCache): | 227 | def filterProviders(providers, item, cfgData, dataCache): |
228 | """ | 228 | """ |
229 | Take a list of providers and filter/reorder according to the | 229 | Take a list of providers and filter/reorder according to the |
230 | environment variables and previous build results | 230 | environment variables and previous build results |
231 | Takes a "normal" target item | 231 | Takes a "normal" target item |
232 | """ | 232 | """ |
@@ -254,7 +254,7 @@ def filterProviders(providers, item, cfgData, dataCache): | |||
254 | 254 | ||
255 | def filterProvidersRunTime(providers, item, cfgData, dataCache): | 255 | def filterProvidersRunTime(providers, item, cfgData, dataCache): |
256 | """ | 256 | """ |
257 | Take a list of providers and filter/reorder according to the | 257 | Take a list of providers and filter/reorder according to the |
258 | environment variables and previous build results | 258 | environment variables and previous build results |
259 | Takes a "runtime" target item | 259 | Takes a "runtime" target item |
260 | """ | 260 | """ |
@@ -297,7 +297,7 @@ def getRuntimeProviders(dataCache, rdepend): | |||
297 | rproviders = [] | 297 | rproviders = [] |
298 | 298 | ||
299 | if rdepend in dataCache.rproviders: | 299 | if rdepend in dataCache.rproviders: |
300 | rproviders += dataCache.rproviders[rdepend] | 300 | rproviders += dataCache.rproviders[rdepend] |
301 | 301 | ||
302 | if rdepend in dataCache.packages: | 302 | if rdepend in dataCache.packages: |
303 | rproviders += dataCache.packages[rdepend] | 303 | rproviders += dataCache.packages[rdepend] |