[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7150/8267] bitbake: cooker/siggen: Reset siggen when reparsing

[Emmanuele Bassi <ebassi src gnome org>]

commit ea9fff4bd030266290e7f7aeef83603a02d35ae1
Author: Richard Purdie <richard purdie linuxfoundation org>
Date:   Tue Aug 8 20:44:36 2017 +0100

    bitbake: cooker/siggen: Reset siggen when reparsing
    
    If we don't do this, we get basehash mismatch errors occurring from the reparse
    which would then set bitbake's error exit code.
    
    This for example would cause oe-selftest -r bbtests.BitbakeTests.test_bbappend_order
    to fail with a non-zero BB_SERVER_TIMEOUT.
    
    (Bitbake rev: e4c6ca9440f63761560b49bbe12654441f54687e)
    
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/cooker.py |    1 +
 bitbake/lib/bb/siggen.py |    3 +++
 2 files changed, 4 insertions(+), 0 deletions(-)
---
diff --git a/bitbake/lib/bb/cooker.py b/bitbake/lib/bb/cooker.py
index 81027db..3740c61 100644
--- a/bitbake/lib/bb/cooker.py
+++ b/bitbake/lib/bb/cooker.py
@@ -1468,6 +1468,7 @@ class BBCooker:
             self.updateCacheSync()
 
         if self.state != state.parsing and not self.parsecache_valid:
+            bb.parse.siggen.reset(self.data)
             self.parseConfiguration ()
             if CookerFeatures.SEND_SANITYEVENTS in self.featureset:
                 for mc in self.multiconfigs:
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index f71190a..4380760 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -94,6 +94,9 @@ class SignatureGeneratorBasic(SignatureGenerator):
         else:
             self.checksum_cache = None
 
+    def reset(self, data):
+        self.__init__(data)
+
     def init_rundepcheck(self, data):
         self.taskwhitelist = data.getVar("BB_HASHTASK_WHITELIST") or None
         if self.taskwhitelist: