diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-05 21:15:08 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-01-06 11:46:14 +0000 |
| commit | 688f7a64917a5ce5cbe12f8e5da4d47e265d240f (patch) | |
| tree | dec209d96fc00cc8a5fdd9ffd3f47abc167e0f4b /meta/lib | |
| parent | af330fc0087692039d4256a6fb1e122742e8ec1a (diff) | |
| download | openembedded-core-contrib-688f7a64917a5ce5cbe12f8e5da4d47e265d240f.tar.gz | |
meta/scripts: Various getVar/getVarFlag expansion parameter fixes
There were a few straggling expansion parameter removals left for
getVar/getVarFlag where the odd whitespace meant they were missed
on previous passes. There were also some plain broken ussages such
as:
d.getVar('ALTERNATIVE_TARGET', old_name, True)
path = d.getVar('PATH', d, True)
d.getVar('IMAGE_ROOTFS', 'True')
which I've corrected (they happend to work by luck).
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib')
| -rw-r--r-- | meta/lib/oe/package_manager.py | 6 | ||||
| -rw-r--r-- | meta/lib/oe/utils.py | 2 | ||||
| -rw-r--r-- | meta/lib/oeqa/runtime/_ptest.py | 2 |
3 files changed, 4 insertions, 6 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index e557473999..a8644cc1c0 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -129,11 +129,9 @@ class RpmIndexer(Indexer): if default_tune: localdata.setVar("DEFAULTTUNE", default_tune) bb.data.update_data(localdata) - package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS', - True).split() + package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split() package_archs[eext[1]].reverse() - target_os[eext[1]] = localdata.getVar("TARGET_OS", - True).strip() + target_os[eext[1]] = localdata.getVar("TARGET_OS").strip() ml_prefix_list = collections.OrderedDict() for mlib in package_archs: diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index 3de21fc030..76806b5195 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py @@ -30,7 +30,7 @@ def less_or_equal(variable, checkvalue, truevalue, falsevalue, d): return falsevalue def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): - result = bb.utils.vercmp_string(d.getVar(variable,True), checkvalue) + result = bb.utils.vercmp_string(d.getVar(variable), checkvalue) if result <= 0: return truevalue else: diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py index cfb4041f18..a2432517e3 100644 --- a/meta/lib/oeqa/runtime/_ptest.py +++ b/meta/lib/oeqa/runtime/_ptest.py @@ -99,7 +99,7 @@ class PtestRunnerTest(oeRuntimeTest): return complementary_pkgs.split() def setUpLocal(self): - self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME')) + self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR"), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME')) @skipUnlessPassed('test_ssh') def test_ptestrunner(self): |