diff options
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r-- | meta/lib/oe/utils.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py index b3473d3476..95daace6c6 100644 --- a/meta/lib/oe/utils.py +++ b/meta/lib/oe/utils.py | |||
@@ -16,19 +16,19 @@ def ifelse(condition, iftrue = True, iffalse = False): | |||
16 | return iffalse | 16 | return iffalse |
17 | 17 | ||
18 | def conditional(variable, checkvalue, truevalue, falsevalue, d): | 18 | def conditional(variable, checkvalue, truevalue, falsevalue, d): |
19 | if bb.data.getVar(variable,d,1) == checkvalue: | 19 | if d.getVar(variable,1) == checkvalue: |
20 | return truevalue | 20 | return truevalue |
21 | else: | 21 | else: |
22 | return falsevalue | 22 | return falsevalue |
23 | 23 | ||
24 | def less_or_equal(variable, checkvalue, truevalue, falsevalue, d): | 24 | def less_or_equal(variable, checkvalue, truevalue, falsevalue, d): |
25 | if float(bb.data.getVar(variable,d,1)) <= float(checkvalue): | 25 | if float(d.getVar(variable,1)) <= float(checkvalue): |
26 | return truevalue | 26 | return truevalue |
27 | else: | 27 | else: |
28 | return falsevalue | 28 | return falsevalue |
29 | 29 | ||
30 | def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): | 30 | def version_less_or_equal(variable, checkvalue, truevalue, falsevalue, d): |
31 | result = bb.vercmp(bb.data.getVar(variable,d,True), checkvalue) | 31 | result = bb.vercmp(d.getVar(variable,True), checkvalue) |
32 | if result <= 0: | 32 | if result <= 0: |
33 | return truevalue | 33 | return truevalue |
34 | else: | 34 | else: |
@@ -48,7 +48,7 @@ def contains(variable, checkvalues, truevalue, falsevalue, d): | |||
48 | return falsevalue | 48 | return falsevalue |
49 | 49 | ||
50 | def both_contain(variable1, variable2, checkvalue, d): | 50 | def both_contain(variable1, variable2, checkvalue, d): |
51 | if bb.data.getVar(variable1,d,1).find(checkvalue) != -1 and bb.data.getVar(variable2,d,1).find(checkvalue) != -1: | 51 | if d.getVar(variable1,1).find(checkvalue) != -1 and d.getVar(variable2,1).find(checkvalue) != -1: |
52 | return checkvalue | 52 | return checkvalue |
53 | else: | 53 | else: |
54 | return "" | 54 | return "" |