[gnome-continuous-yocto/gnomeostree-3.28-rocko: 3787/8267] bitbake: bitbake: remove True option to getVar calls (take 2)

[Emmanuele Bassi <ebassi src gnome org>]

commit 97f83e911ebb2c9d1af5de55a94c994dced39d82
Author: Joshua Lock <joshua g lock intel com>
Date:   Wed Dec 14 21:05:01 2016 +0000

    bitbake: bitbake: remove True option to getVar calls (take 2)
    
    getVar() now defaults to expanding by default, thus remove the True
    option from getVar() calls with a regex search and replace.
    
    Search made with the following regex: getVar ?\(( ?[^,()]*), True\)
    
    (a follow on patch to fix up a few recent introductions)
    
    (Bitbake rev: f9961fd5beb31d5ab9656a5be59f7ab3effef2f0)
    
    Signed-off-by: Joshua Lock <joshua g lock intel com>
    Signed-off-by: Ross Burton <ross burton intel com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 bitbake/lib/bb/server/process.py |    2 +-
 bitbake/lib/bb/siggen.py         |    2 +-
 bitbake/lib/bb/tests/data.py     |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/bitbake/lib/bb/server/process.py b/bitbake/lib/bb/server/process.py
index 1036366..c9dfb4f 100644
--- a/bitbake/lib/bb/server/process.py
+++ b/bitbake/lib/bb/server/process.py
@@ -103,7 +103,7 @@ class ProcessServer(Process, BaseImplServer):
             self.event_queue.put(event)
         self.event_handle.value = bb.event.register_UIHhandler(self, True)
 
-        heartbeat_event = self.cooker.data.getVar('BB_HEARTBEAT_EVENT', True)
+        heartbeat_event = self.cooker.data.getVar('BB_HEARTBEAT_EVENT')
         if heartbeat_event:
             try:
                 self.heartbeat_seconds = float(heartbeat_event)
diff --git a/bitbake/lib/bb/siggen.py b/bitbake/lib/bb/siggen.py
index b20b9cf..659d27d 100644
--- a/bitbake/lib/bb/siggen.py
+++ b/bitbake/lib/bb/siggen.py
@@ -101,7 +101,7 @@ class SignatureGeneratorBasic(SignatureGenerator):
 
     def _build_data(self, fn, d):
 
-        ignore_mismatch = ((d.getVar("BB_HASH_IGNORE_MISMATCH", True) or '') == '1')
+        ignore_mismatch = ((d.getVar("BB_HASH_IGNORE_MISMATCH") or '') == '1')
         tasklist, gendeps, lookupcache = bb.data.generate_dependencies(d)
 
         taskdeps = {}
diff --git a/bitbake/lib/bb/tests/data.py b/bitbake/lib/bb/tests/data.py
index ba30d12..0903ba7 100644
--- a/bitbake/lib/bb/tests/data.py
+++ b/bitbake/lib/bb/tests/data.py
@@ -465,7 +465,7 @@ class Serialize(unittest.TestCase):
         os.remove(tmpfilename)
 
         self.assertEqual(d, newd)
-        self.assertEqual(newd.getVar('HELLO', True), 'world')
+        self.assertEqual(newd.getVar('HELLO'), 'world')
         self.assertEqual(newd.getVarFlag('HELLO', 'other'), 'planet')