diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
-rw-r--r-- | bitbake/lib/bb/cooker.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index 1f4cc1e96d..4b5ef07eaa 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
@@ -73,7 +73,9 @@ class SkippedPackage: | |||
73 | self.pn = info.pn | 73 | self.pn = info.pn |
74 | self.skipreason = info.skipreason | 74 | self.skipreason = info.skipreason |
75 | self.provides = info.provides | 75 | self.provides = info.provides |
76 | self.rprovides = info.rprovides | 76 | self.rprovides = info.packages + info.rprovides |
77 | for package in info.packages: | ||
78 | self.rprovides += info.rprovides_pkg[package] | ||
77 | elif reason: | 79 | elif reason: |
78 | self.skipreason = reason | 80 | self.skipreason = reason |
79 | 81 | ||
@@ -2207,18 +2209,18 @@ class CookerParser(object): | |||
2207 | except bb.BBHandledException as exc: | 2209 | except bb.BBHandledException as exc: |
2208 | self.error += 1 | 2210 | self.error += 1 |
2209 | logger.error('Failed to parse recipe: %s' % exc.recipe) | 2211 | logger.error('Failed to parse recipe: %s' % exc.recipe) |
2210 | self.shutdown(clean=False) | 2212 | self.shutdown(clean=False, force=True) |
2211 | return False | 2213 | return False |
2212 | except ParsingFailure as exc: | 2214 | except ParsingFailure as exc: |
2213 | self.error += 1 | 2215 | self.error += 1 |
2214 | logger.error('Unable to parse %s: %s' % | 2216 | logger.error('Unable to parse %s: %s' % |
2215 | (exc.recipe, bb.exceptions.to_string(exc.realexception))) | 2217 | (exc.recipe, bb.exceptions.to_string(exc.realexception))) |
2216 | self.shutdown(clean=False) | 2218 | self.shutdown(clean=False, force=True) |
2217 | return False | 2219 | return False |
2218 | except bb.parse.ParseError as exc: | 2220 | except bb.parse.ParseError as exc: |
2219 | self.error += 1 | 2221 | self.error += 1 |
2220 | logger.error(str(exc)) | 2222 | logger.error(str(exc)) |
2221 | self.shutdown(clean=False) | 2223 | self.shutdown(clean=False, force=True) |
2222 | return False | 2224 | return False |
2223 | except bb.data_smart.ExpansionError as exc: | 2225 | except bb.data_smart.ExpansionError as exc: |
2224 | self.error += 1 | 2226 | self.error += 1 |
@@ -2227,7 +2229,7 @@ class CookerParser(object): | |||
2227 | tb = list(itertools.dropwhile(lambda e: e.filename.startswith(bbdir), exc.traceback)) | 2229 | tb = list(itertools.dropwhile(lambda e: e.filename.startswith(bbdir), exc.traceback)) |
2228 | logger.error('ExpansionError during parsing %s', value.recipe, | 2230 | logger.error('ExpansionError during parsing %s', value.recipe, |
2229 | exc_info=(etype, value, tb)) | 2231 | exc_info=(etype, value, tb)) |
2230 | self.shutdown(clean=False) | 2232 | self.shutdown(clean=False, force=True) |
2231 | return False | 2233 | return False |
2232 | except Exception as exc: | 2234 | except Exception as exc: |
2233 | self.error += 1 | 2235 | self.error += 1 |
@@ -2239,7 +2241,7 @@ class CookerParser(object): | |||
2239 | # Most likely, an exception occurred during raising an exception | 2241 | # Most likely, an exception occurred during raising an exception |
2240 | import traceback | 2242 | import traceback |
2241 | logger.error('Exception during parse: %s' % traceback.format_exc()) | 2243 | logger.error('Exception during parse: %s' % traceback.format_exc()) |
2242 | self.shutdown(clean=False) | 2244 | self.shutdown(clean=False, force=True) |
2243 | return False | 2245 | return False |
2244 | 2246 | ||
2245 | self.current += 1 | 2247 | self.current += 1 |