[gnome-continuous-yocto/gnomeostree-3.28-rocko: 7491/8267] bitbake: tinfoil: ensure variable history tracking works when parsing a recipe

[Emmanuele Bassi <ebassi src gnome org>]

commit 8f716abaa48a61a264a854ce081ee551e6a8fbbc
Author: Paul Eggleton <paul eggleton linux intel com>
Date:   Thu Aug 31 11:30:45 2017 +1200

    bitbake: tinfoil: ensure variable history tracking works when parsing a recipe
    
    If you set tracking=True when creating the tinfoil object, that ensures
    history is collected for the main datastore, but at the end of parsing
    the configuration, history tracking gets turned off to save time with
    the result that we don't collect history for any recipes we parse.
    Enable tracking when we parse a recipe (and disable it afterwards if we
    enabled it) in order to fix this.
    
    This fixes functionality in OE's devtool that relies upon variable
    history (such as devtool upgrade updating PV when it's set within a
    recipe).
    
    (Bitbake rev: cc8b4c81bb589fb70774a0151f87a8d277f40f06)
    
    Signed-off-by: Paul Eggleton <paul eggleton linux intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/tinfoil.py |   29 ++++++++++++++++++-----------
 1 files changed, 18 insertions(+), 11 deletions(-)
---
diff --git a/bitbake/lib/bb/tinfoil.py b/bitbake/lib/bb/tinfoil.py
index b50ed05..fb2ee4a 100644
--- a/bitbake/lib/bb/tinfoil.py
+++ b/bitbake/lib/bb/tinfoil.py
@@ -635,17 +635,24 @@ class Tinfoil:
                          specify config_data then you cannot use a virtual
                          specification for fn.
         """
-        if appends and appendlist == []:
-            appends = False
-        if config_data:
-            dctr = bb.remotedata.RemoteDatastores.transmit_datastore(config_data)
-            dscon = self.run_command('parseRecipeFile', fn, appends, appendlist, dctr)
-        else:
-            dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
-        if dscon:
-            return self._reconvert_type(dscon, 'DataStoreConnectionHandle')
-        else:
-            return None
+        if self.tracking:
+            # Enable history tracking just for the parse operation
+            self.run_command('enableDataTracking')
+        try:
+            if appends and appendlist == []:
+                appends = False
+            if config_data:
+                dctr = bb.remotedata.RemoteDatastores.transmit_datastore(config_data)
+                dscon = self.run_command('parseRecipeFile', fn, appends, appendlist, dctr)
+            else:
+                dscon = self.run_command('parseRecipeFile', fn, appends, appendlist)
+            if dscon:
+                return self._reconvert_type(dscon, 'DataStoreConnectionHandle')
+            else:
+                return None
+        finally:
+            if self.tracking:
+                self.run_command('disableDataTracking')
 
     def build_file(self, buildfile, task, internal=True):
         """