[PATCH] package: ensure do_split_packages doesn't return duplicates

[PATCH] package: ensure do_split_packages doesn't return duplicates

[Ross Burton]

do_split_package() constructs a list of packages that were created as it
iterates through the files, so if multiple files go into the same package then
the package will be repeated in the output.

Solve this by using a set() to store the created packages so that duplicates are
ignored.

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/classes/package.bbclass | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass
index 4452e2f..8cf9c16 100644
--- a/meta/classes/package.bbclass
+++ b/meta/classes/package.bbclass
@@ -146,7 +146,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
 
 
     packages = d.getVar('PACKAGES', True).split()
-    split_packages = []
+    split_packages = set()
 
     if postinst:
         postinst = '#!/bin/sh\n' + postinst + '\n'
@@ -183,7 +183,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
             continue
         on = legitimize_package_name(m.group(1))
         pkg = output_pattern % on
-        split_packages.append(pkg)
+        split_packages.add(pkg)
         if not pkg in packages:
             if prepend:
                 packages = [pkg] + packages
@@ -226,7 +226,7 @@ def do_split_packages(d, root, file_regex, output_pattern, description, postinst
             hook(f, pkg, file_regex, output_pattern, m.group(1))
 
     d.setVar('PACKAGES', ' '.join(packages))
-    return split_packages
+    return list(split_packages)
 
 PACKAGE_DEPENDS += "file-native"
 
-- 
2.7.0

Re: [PATCH] package: ensure do_split_packages doesn't return duplicates

[Richard Purdie]

On Thu, 2016-04-07 at 09:56 +0100, Ross Burton wrote:
> do_split_package() constructs a list of packages that were created as
> it
> iterates through the files, so if multiple files go into the same
> package then
> the package will be repeated in the output.
> 
> Solve this by using a set() to store the created packages so that
> duplicates are
> ignored.

Is this order sensitive? I know PACKAGES is :(

Cheers,

Richard

Re: [PATCH] package: ensure do_split_packages doesn't return duplicates

[Burton, Ross]

[-- Attachment #1: Type: text/plain, Size: 751 bytes --]

On 8 April 2016 at 08:01, Richard Purdie <richard.purdie@linuxfoundation.org
> wrote:

> On Thu, 2016-04-07 at 09:56 +0100, Ross Burton wrote:
> > do_split_package() constructs a list of packages that were created as
> > it
> > iterates through the files, so if multiple files go into the same
> > package then
> > the package will be repeated in the output.
> >
> > Solve this by using a set() to store the created packages so that
> > duplicates are
> > ignored.
>
> Is this order sensitive? I know PACKAGES is :(
>

The order of the output is based on the order that files are found on
disk.  I'll review the users in oe-core to verify that nothing there has
expectations on the contents beyond a list of package names.

Ross

[-- Attachment #2: Type: text/html, Size: 1188 bytes --]