diff options
Diffstat (limited to 'meta/lib')
-rw-r--r-- | meta/lib/oe/data.py | 2 | ||||
-rw-r--r-- | meta/lib/oe/packagegroup.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/lib/oe/data.py b/meta/lib/oe/data.py index 4cc0e02968..e49572177b 100644 --- a/meta/lib/oe/data.py +++ b/meta/lib/oe/data.py | |||
@@ -3,7 +3,7 @@ import oe.maketype | |||
3 | def typed_value(key, d): | 3 | def typed_value(key, d): |
4 | """Construct a value for the specified metadata variable, using its flags | 4 | """Construct a value for the specified metadata variable, using its flags |
5 | to determine the type and parameters for construction.""" | 5 | to determine the type and parameters for construction.""" |
6 | var_type = d.getVarFlag(key, 'type') | 6 | var_type = d.getVarFlag(key, 'type', True) |
7 | flags = d.getVarFlags(key) | 7 | flags = d.getVarFlags(key) |
8 | if flags is not None: | 8 | if flags is not None: |
9 | flags = dict((flag, d.expand(value)) | 9 | flags = dict((flag, d.expand(value)) |
diff --git a/meta/lib/oe/packagegroup.py b/meta/lib/oe/packagegroup.py index 12eb4212ff..a6fee5f950 100644 --- a/meta/lib/oe/packagegroup.py +++ b/meta/lib/oe/packagegroup.py | |||
@@ -3,9 +3,9 @@ import itertools | |||
3 | def is_optional(feature, d): | 3 | def is_optional(feature, d): |
4 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True) | 4 | packages = d.getVar("FEATURE_PACKAGES_%s" % feature, True) |
5 | if packages: | 5 | if packages: |
6 | return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional")) | 6 | return bool(d.getVarFlag("FEATURE_PACKAGES_%s" % feature, "optional", True)) |
7 | else: | 7 | else: |
8 | return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional")) | 8 | return bool(d.getVarFlag("PACKAGE_GROUP_%s" % feature, "optional", True)) |
9 | 9 | ||
10 | def packages(features, d): | 10 | def packages(features, d): |
11 | for feature in features: | 11 | for feature in features: |