diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-05-09 16:31:22 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-05-16 23:32:39 +0100 |
commit | 1fc840ffc0267ecf3a15c4a59ab44869ef1d6339 (patch) | |
tree | b2932a0d0d7146bde799db47497236063050fc84 /meta/lib/oe/manifest.py | |
parent | 22c8ed6484e0ee9328e3844c9e794f3d89ebb9f7 (diff) | |
download | poky-1fc840ffc0267ecf3a15c4a59ab44869ef1d6339.tar.gz |
meta: python3 megapatch
This needs splutting into smaller units, WIP atm.
(From OE-Core rev: 21529228a7dca96a6a1b44ed9380c523efdeeb3e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/manifest.py')
-rw-r--r-- | meta/lib/oe/manifest.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/meta/lib/oe/manifest.py b/meta/lib/oe/manifest.py index 42832f15d2..95f8eb2df3 100644 --- a/meta/lib/oe/manifest.py +++ b/meta/lib/oe/manifest.py | |||
@@ -4,11 +4,10 @@ import re | |||
4 | import bb | 4 | import bb |
5 | 5 | ||
6 | 6 | ||
7 | class Manifest(object): | 7 | class Manifest(object, metaclass=ABCMeta): |
8 | """ | 8 | """ |
9 | This is an abstract class. Do not instantiate this directly. | 9 | This is an abstract class. Do not instantiate this directly. |
10 | """ | 10 | """ |
11 | __metaclass__ = ABCMeta | ||
12 | 11 | ||
13 | PKG_TYPE_MUST_INSTALL = "mip" | 12 | PKG_TYPE_MUST_INSTALL = "mip" |
14 | PKG_TYPE_MULTILIB = "mlp" | 13 | PKG_TYPE_MULTILIB = "mlp" |
@@ -219,7 +218,7 @@ class RpmManifest(Manifest): | |||
219 | if var in self.vars_to_split: | 218 | if var in self.vars_to_split: |
220 | split_pkgs = self._split_multilib(self.d.getVar(var, True)) | 219 | split_pkgs = self._split_multilib(self.d.getVar(var, True)) |
221 | if split_pkgs is not None: | 220 | if split_pkgs is not None: |
222 | pkgs = dict(pkgs.items() + split_pkgs.items()) | 221 | pkgs = dict(list(pkgs.items()) + list(split_pkgs.items())) |
223 | else: | 222 | else: |
224 | pkg_list = self.d.getVar(var, True) | 223 | pkg_list = self.d.getVar(var, True) |
225 | if pkg_list is not None: | 224 | if pkg_list is not None: |
@@ -269,7 +268,7 @@ class OpkgManifest(Manifest): | |||
269 | if var in self.vars_to_split: | 268 | if var in self.vars_to_split: |
270 | split_pkgs = self._split_multilib(self.d.getVar(var, True)) | 269 | split_pkgs = self._split_multilib(self.d.getVar(var, True)) |
271 | if split_pkgs is not None: | 270 | if split_pkgs is not None: |
272 | pkgs = dict(pkgs.items() + split_pkgs.items()) | 271 | pkgs = dict(list(pkgs.items()) + list(split_pkgs.items())) |
273 | else: | 272 | else: |
274 | pkg_list = self.d.getVar(var, True) | 273 | pkg_list = self.d.getVar(var, True) |
275 | if pkg_list is not None: | 274 | if pkg_list is not None: |