From 12f47c23df8c109676f66d580d666a3147f3b046 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Mon, 10 Feb 2014 09:32:04 +0200 Subject: lib/oe/package_manager.py: RpmPM: fix issue with multilib builds Use python sets instead of lists, to avoid duplicates. When doing a multilib build, "smart channel --add" fails because it tries to add 'all' channel twice. (From OE-Core rev: 730d675090eec5c03e444f0448d96a52035d0bef) Signed-off-by: Laurentiu Palcu Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) (limited to 'meta/lib/oe/package_manager.py') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index dfcb0ef783..49b5ac8e75 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -187,19 +187,18 @@ class RpmPM(PackageManager): self.ml_os_list['default']) # List must be prefered to least preferred order - default_platform_extra = list() - platform_extra = list() + default_platform_extra = set() + platform_extra = set() bbextendvariant = self.d.getVar('BBEXTENDVARIANT', True) or "" for mlib in self.ml_os_list: for arch in self.ml_prefix_list[mlib]: plt = arch.replace('-', '_') + '-.*-' + self.ml_os_list[mlib] if mlib == bbextendvariant: - if plt not in default_platform_extra: - default_platform_extra.append(plt) + default_platform_extra.add(plt) else: - if plt not in platform_extra: - platform_extra.append(plt) - platform_extra = default_platform_extra + platform_extra + platform_extra.add(plt) + + platform_extra = platform_extra.union(default_platform_extra) self._create_configs(platform, platform_extra) -- cgit v1.2.3-54-g00ecf