diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-06 15:11:18 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-07-06 15:11:18 +0530 |
| commit | 7f1a41e93d50c8f02ab0e879903a650efc53ce48 (patch) | |
| tree | 69ca25dd2d387e453baa7c727b3197df26f77fc9 | |
| parent | 5b48b2dbdbe0cabce703df56f9a21ddd6012a163 (diff) | |
cerbero: Fix packaging on Windows
This broke in 8f0c0915f9332364409c75cbb8536025ed1dbebb, with the
changes in `packages/gstreamer-1.0/gstreamer-1.0.package`.
`self.platform_packages` gets added twice if we fetch `self.package`
twice in one assignment. We didn't notice this earlier because we only
use `platform_packages` on Windows.
> gstreamer-1.0-msvc-x86_64-1.17.2.wxs(150) : error LGHT0091 : Duplicate symbol 'Feature:_vsintegration_1.0' found. This typically means that an Id is duplicated. Check to make sure all your identifiers of a given type (File, Component, Feature) are unique.
> gstreamer-1.0-msvc-x86_64-1.17.2.wxs(157) : error LGHT0092 : Location of symbol related to previous error.
> gstreamer-1.0-msvc-x86_64-1.17.2.wxs(153) : error LGHT0091 : Duplicate symbol 'Feature:_gstreamer_1.0_vs_templates' found. This typically means that an Id is duplicated. Check to make sure all your identifiers of a given type (File, Component, Feature) are unique.
> gstreamer-1.0-msvc-x86_64-1.17.2.wxs(160) : error LGHT0092 : Location of symbol related to previous error.
Part-of: <https://gitlab.freedesktop.org/gstreamer/cerbero/-/merge_requests/536>
| -rw-r--r-- | cerbero/packages/package.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/cerbero/packages/package.py b/cerbero/packages/package.py index d9a7ba4e..6e8d1d05 100644 --- a/cerbero/packages/package.py +++ b/cerbero/packages/package.py @@ -446,7 +446,10 @@ class MetaPackage(PackageBase): platform_attr_name) if self.config.target_platform in platform_attr: platform_list = platform_attr[self.config.target_platform] - ret.extend(platform_list) + # Add to packages list, but do not duplicate + for p in platform_list: + if p not in ret: + ret.append(p) return ret else: return PackageBase.__getattribute__(self, name) |