diff options
Diffstat (limited to 'bitbake/lib/bb/cooker.py')
| -rw-r--r-- | bitbake/lib/bb/cooker.py | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py index ad08c473ae..5ee1c0ac85 100644 --- a/bitbake/lib/bb/cooker.py +++ b/bitbake/lib/bb/cooker.py | |||
| @@ -416,19 +416,16 @@ class BBCooker: | |||
| 416 | clean = True | 416 | clean = True |
| 417 | for o in options: | 417 | for o in options: |
| 418 | if o in ['prefile', 'postfile']: | 418 | if o in ['prefile', 'postfile']: |
| 419 | server_val = getattr(self.configuration, "%s_server" % o, None) | 419 | # Only these options may require a reparse |
| 420 | if not options[o] and server_val: | 420 | try: |
| 421 | # restore value provided on server start | 421 | if getattr(self.configuration, o) == options[o]: |
| 422 | logger.debug(1, "Restoring server value for option '%s'" % o) | 422 | # Value is the same, no need to mark dirty |
| 423 | setattr(self.configuration, o, server_val) | 423 | continue |
| 424 | clean = False | 424 | except AttributeError: |
| 425 | continue | 425 | pass |
| 426 | if getattr(self.configuration, o) == options[o]: | 426 | logger.debug(1, "Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) |
| 427 | # Value is the same, no need to mark dirty | 427 | print("Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) |
| 428 | continue | 428 | clean = False |
| 429 | else: | ||
| 430 | logger.debug(1, "Marking as dirty due to '%s' option change to '%s'" % (o, options[o])) | ||
| 431 | clean = False | ||
| 432 | setattr(self.configuration, o, options[o]) | 429 | setattr(self.configuration, o, options[o]) |
| 433 | for k in bb.utils.approved_variables(): | 430 | for k in bb.utils.approved_variables(): |
| 434 | if k in environment and k not in self.configuration.env: | 431 | if k in environment and k not in self.configuration.env: |