diff options
| author |   Joshua Lock <joshua.g.lock@intel.com> | 2016-12-14 21:05:01 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-12-16 10:04:18 +0000 |
| commit | f9961fd5beb31d5ab9656a5be59f7ab3effef2f0 (patch) | |
| tree | 29fe62f44689f73cc011c35eada97be93f3a67f7 /lib | |
| parent | f1cd6fab604f14d8686b1d783cbfe012d923ee42 (diff) | |
| download | bitbake-contrib-f9961fd5beb31d5ab9656a5be59f7ab3effef2f0.tar.gz | |
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)
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>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/bb/server/process.py | 2 | ||||
| -rw-r--r-- | lib/bb/siggen.py | 2 | ||||
| -rw-r--r-- | lib/bb/tests/data.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/bb/server/process.py b/lib/bb/server/process.py index 1036366ab..c9dfb4fa2 100644 --- a/lib/bb/server/process.py +++ b/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/lib/bb/siggen.py b/lib/bb/siggen.py index b20b9cf77..659d27dfd 100644 --- a/lib/bb/siggen.py +++ b/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/lib/bb/tests/data.py b/lib/bb/tests/data.py index ba30d1280..0903ba7cc 100644 --- a/lib/bb/tests/data.py +++ b/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') |