summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/manifest.py
diff options
context:
space:
mode:
Diffstat (limited to 'meta/lib/oe/manifest.py')
-rw-r--r--meta/lib/oe/manifest.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/manifest.py b/meta/lib/oe/manifest.py
index 42832f1..ec2ef50 100644
--- a/meta/lib/oe/manifest.py
+++ b/meta/lib/oe/manifest.py
@@ -219,7 +219,7 @@ class RpmManifest(Manifest):
219 if var in self.vars_to_split: 219 if var in self.vars_to_split:
220 split_pkgs = self._split_multilib(self.d.getVar(var, True)) 220 split_pkgs = self._split_multilib(self.d.getVar(var, True))
221 if split_pkgs is not None: 221 if split_pkgs is not None:
222 pkgs = dict(pkgs.items() + split_pkgs.items()) 222 pkgs = dict(list(pkgs.items()) + list(split_pkgs.items()))
223 else: 223 else:
224 pkg_list = self.d.getVar(var, True) 224 pkg_list = self.d.getVar(var, True)
225 if pkg_list is not None: 225 if pkg_list is not None:
@@ -269,7 +269,7 @@ class OpkgManifest(Manifest):
269 if var in self.vars_to_split: 269 if var in self.vars_to_split:
270 split_pkgs = self._split_multilib(self.d.getVar(var, True)) 270 split_pkgs = self._split_multilib(self.d.getVar(var, True))
271 if split_pkgs is not None: 271 if split_pkgs is not None:
272 pkgs = dict(pkgs.items() + split_pkgs.items()) 272 pkgs = dict(list(pkgs.items()) + list(split_pkgs.items()))
273 else: 273 else:
274 pkg_list = self.d.getVar(var, True) 274 pkg_list = self.d.getVar(var, True)
275 if pkg_list is not None: 275 if pkg_list is not None: