diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index d4dd23f09c..11c611de72 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -601,9 +601,9 @@ class BBCooker: | |||
601 | # this showEnvironment() code path doesn't use the cache | 601 | # this showEnvironment() code path doesn't use the cache |
602 | self.parseConfiguration() | 602 | self.parseConfiguration() |
603 | 603 | ||
604 | fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) | 604 | fn, cls = bb.cache.virtualfn2realfn(buildfile) |
605 | fn = self.matchFile(fn) | 605 | fn = self.matchFile(fn) |
606 | fn = bb.cache.Cache.realfn2virtual(fn, cls) | 606 | fn = bb.cache.realfn2virtual(fn, cls) |
607 | elif len(pkgs_to_build) == 1: | 607 | elif len(pkgs_to_build) == 1: |
608 | ignore = self.expanded_data.getVar("ASSUME_PROVIDED", True) or "" | 608 | ignore = self.expanded_data.getVar("ASSUME_PROVIDED", True) or "" |
609 | if pkgs_to_build[0] in set(ignore.split()): | 609 | if pkgs_to_build[0] in set(ignore.split()): |
@@ -1249,7 +1249,7 @@ class BBCooker: | |||
1249 | if (task == None): | 1249 | if (task == None): |
1250 | task = self.configuration.cmd | 1250 | task = self.configuration.cmd |
1251 | 1251 | ||
1252 | fn, cls = bb.cache.Cache.virtualfn2realfn(buildfile) | 1252 | fn, cls = bb.cache.virtualfn2realfn(buildfile) |
1253 | fn = self.matchFile(fn) | 1253 | fn = self.matchFile(fn) |
1254 | 1254 | ||
1255 | self.buildSetVars() | 1255 | self.buildSetVars() |
@@ -1259,7 +1259,7 @@ class BBCooker: | |||
1259 | self.caches_array) | 1259 | self.caches_array) |
1260 | infos = dict(infos) | 1260 | infos = dict(infos) |
1261 | 1261 | ||
1262 | fn = bb.cache.Cache.realfn2virtual(fn, cls) | 1262 | fn = bb.cache.realfn2virtual(fn, cls) |
1263 | try: | 1263 | try: |
1264 | info_array = infos[fn] | 1264 | info_array = infos[fn] |
1265 | except KeyError: | 1265 | except KeyError: |
@@ -1822,7 +1822,7 @@ class CookerCollectFiles(object): | |||
1822 | # Calculate priorities for each file | 1822 | # Calculate priorities for each file |
1823 | matched = set() | 1823 | matched = set() |
1824 | for p in pkgfns: | 1824 | for p in pkgfns: |
1825 | realfn, cls = bb.cache.Cache.virtualfn2realfn(p) | 1825 | realfn, cls = bb.cache.virtualfn2realfn(p) |
1826 | priorities[p] = self.calc_bbfile_priority(realfn, matched) | 1826 | priorities[p] = self.calc_bbfile_priority(realfn, matched) |
1827 | 1827 | ||
1828 | # Don't show the warning if the BBFILE_PATTERN did match .bbappend files | 1828 | # Don't show the warning if the BBFILE_PATTERN did match .bbappend files |