[PATCH 0/2] Config re-parse improvements

[PATCH 0/2] Config re-parse improvements

[Markus Lehtonen]

These two patches improve config (re-)parsing by allowing multiple passes of
re-parse.


The following changes since commit 57912de63fa83550c0ae658eb99b76e9cc91a8d1:

  cooker: record events on cooker exit (2016-09-06 10:36:34 +0100)

are available in the git repository at:

  git://git.openembedded.org/openembedded-core-contrib marquiz/bitbake/fixes-10188
  http://git.openembedded.org/openembedded-core-contrib/log/?h=marquiz/bitbake/fixes-10188

Markus Lehtonen (2):
  cookerdata: fire ConfigParsed event after re-parse
  cookerdata: allow multiple passes of config re-parsing

 lib/bb/cookerdata.py | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

-- 
2.6.6

[PATCH 1/2] cookerdata: fire ConfigParsed event after re-parse

[Markus Lehtonen]

[YOCTO #10188]

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 lib/bb/cookerdata.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index bf9bfbf..07425ce 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -273,6 +273,7 @@ class CookerDataBuilder(object):
             if self.data.getVar("BB_INVALIDCONF", False) is True:
                 self.data.setVar("BB_INVALIDCONF", False)
                 self.data = self.parseConfigurationFiles(self.prefiles, self.postfiles)
+                bb.event.fire(bb.event.ConfigParsed(), self.data)
 
             bb.parse.init_parser(self.data)
             self.data_hash = self.data.get_hash()
-- 
2.6.6

[PATCH 2/2] cookerdata: allow multiple passes of config re-parsing

[Markus Lehtonen]

[YOCTO #10188]

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>
---
 lib/bb/cookerdata.py | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/bb/cookerdata.py b/lib/bb/cookerdata.py
index 07425ce..9e88f95 100644
--- a/lib/bb/cookerdata.py
+++ b/lib/bb/cookerdata.py
@@ -270,9 +270,16 @@ class CookerDataBuilder(object):
 
             bb.event.fire(bb.event.ConfigParsed(), self.data)
 
-            if self.data.getVar("BB_INVALIDCONF", False) is True:
+            reparse_cnt = 0
+            while self.data.getVar("BB_INVALIDCONF", False) is True:
+                if reparse_cnt > 20:
+                    logger.error("Configuration has been re-parsed over 20 times, "
+                                 "breaking out of the loop...")
+                    raise Exception("Too deep config re-parse loop. Check locations where "
+                                    "BB_INVALIDCONF is being set (ConfigParsed event handlers)")
                 self.data.setVar("BB_INVALIDCONF", False)
                 self.data = self.parseConfigurationFiles(self.prefiles, self.postfiles)
+                reparse_cnt += 1
                 bb.event.fire(bb.event.ConfigParsed(), self.data)
 
             bb.parse.init_parser(self.data)
-- 
2.6.6