summaryrefslogtreecommitdiffstats
path: root/meta/lib
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib')
-rw-r--r--meta/lib/oe/package_manager.py6
-rw-r--r--meta/lib/oe/utils.py2
-rw-r--r--meta/lib/oeqa/runtime/_ptest.py2
3 files changed, 4 insertions, 6 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index e557473..a8644cc 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -129,11 +129,9 @@ class RpmIndexer(Indexer):
129 if default_tune: 129 if default_tune:
130 localdata.setVar("DEFAULTTUNE", default_tune) 130 localdata.setVar("DEFAULTTUNE", default_tune)
131 bb.data.update_data(localdata) 131 bb.data.update_data(localdata)
132 package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS', 132 package_archs[eext[1]] = localdata.getVar('PACKAGE_ARCHS').split()
133 True).split()
134 package_archs[eext[1]].reverse() 133 package_archs[eext[1]].reverse()
135 target_os[eext[1]] = localdata.getVar("TARGET_OS", 134 target_os[eext[1]] = localdata.getVar("TARGET_OS").strip()
136 True).strip()
137 135
138 ml_prefix_list = collections.OrderedDict() 136 ml_prefix_list = collections.OrderedDict()
139 for mlib in package_archs: 137 for mlib in package_archs:
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index 3de21fc..76806b5 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):
30 return falsevalue 30 return falsevalue
31 31
32def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): 32def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d):
33 result = bb.utils.vercmp_string(d.getVar(variable,True), checkvalue) 33 result = bb.utils.vercmp_string(d.getVar(variable), checkvalue)
34 if result <= 0: 34 if result <= 0:
35 return truevalue 35 return truevalue
36 else: 36 else:
diff --git a/meta/lib/oeqa/runtime/_ptest.py b/meta/lib/oeqa/runtime/_ptest.py
index cfb4041..a243251 100644
--- a/meta/lib/oeqa/runtime/_ptest.py
+++ b/meta/lib/oeqa/runtime/_ptest.py
@@ -99,7 +99,7 @@ class PtestRunnerTest(oeRuntimeTest):
99 return complementary_pkgs.split() 99 return complementary_pkgs.split()
100 100
101 def setUpLocal(self): 101 def setUpLocal(self):
102 self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR",True), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME')) 102 self.ptest_log = os.path.join(oeRuntimeTest.tc.d.getVar("TEST_LOG_DIR"), "ptest-%s.log" % oeRuntimeTest.tc.d.getVar('DATETIME'))
103 103
104 @skipUnlessPassed('test_ssh') 104 @skipUnlessPassed('test_ssh')
105 def test_ptestrunner(self): 105 def test_ptestrunner(self):