diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/image.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/kernel-module-split.bbclass | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 979921f58c..251bc9abfd 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -368,7 +368,7 @@ for dir in dirs.split(): key=str(os.path.join("/",os.path.relpath(item,dir))) valid=True; - if files.has_key(key): + if key in files: #check whether the file is allow to replace if allow_rep.match(key): valid=True diff --git a/meta/classes/kernel-module-split.bbclass b/meta/classes/kernel-module-split.bbclass index 45639c613c..9a4329dcc9 100644 --- a/meta/classes/kernel-module-split.bbclass +++ b/meta/classes/kernel-module-split.bbclass @@ -109,7 +109,7 @@ python split_kernel_module_packages () { # instead is prefixed with /lib/modules/${KERNEL_VERSION} file = file.replace("/lib/modules/%s/" % d.getVar('KERNEL_VERSION', True) or '', '', 1) - if module_deps.has_key(file): + if file in module_deps: dependencies = [] for i in module_deps[file]: m = re.match(pattern, os.path.basename(i)) @@ -153,7 +153,7 @@ python split_kernel_module_packages () { files = "%s /etc/modules-load.d/%s.conf /etc/modprobe.d/%s.conf" % (files, basename, basename) d.setVar('FILES_%s' % pkg, files) - if vals.has_key("description"): + if "description" in vals: old_desc = d.getVar('DESCRIPTION_' + pkg, True) or "" d.setVar('DESCRIPTION_' + pkg, old_desc + "; " + vals["description"]) |