[gnome-continuous-yocto/gnomeostree-3.28-rocko: 2883/8267] package_manager.py: Allow multiple regexps in PACKAGE_EXCLUDE_COMPLEMENTARY

[Emmanuele Bassi <ebassi src gnome org>]

commit d067b0e1e48a4efadb94e0d855608f0c19b43a16
Author: Peter Kjellerstedt <peter kjellerstedt axis com>
Date:   Wed Oct 5 17:30:46 2016 +0200

    package_manager.py: Allow multiple regexps in PACKAGE_EXCLUDE_COMPLEMENTARY
    
    The PACKAGE_EXCLUDE_COMPLEMENTARY variable can currently only contain
    one regular expression. This makes it hard to add to it from different
    configuration files and recipes.
    
    Allowing it to contain multiple, whitespace separated regular
    expressions should be backwards compatible as it is assumed that
    whitespace is not used in package names and thus is not used in any
    existing instances of the variable.
    
    After this change, the following three examples should be equivalent:
    
      PACKAGE_EXCLUDE_COMPLEMENTARY = "foo|bar"
    
      PACKAGE_EXCLUDE_COMPLEMENTARY = "foo bar"
    
      PACKAGE_EXCLUDE_COMPLEMENTARY = "foo"
      PACKAGE_EXCLUDE_COMPLEMENTARY += "bar"
    
    (From OE-Core rev: a5f7e98a94e96d40b1276c85249619aa8d7be847)
    
    Signed-off-by: Peter Kjellerstedt <peter kjellerstedt axis com>
    Signed-off-by: Richard Purdie <richard purdie linuxfoundation org>

 meta/lib/oe/package_manager.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
---
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 5f86aff..3cee973 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -598,7 +598,7 @@ class PackageManager(object, metaclass=ABCMeta):
                globs]
         exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True)
         if exclude:
-            cmd.extend(['--exclude=' + exclude])
+            cmd.extend(['--exclude=' + '|'.join(exclude.split())])
         try:
             bb.note("Installing complementary packages ...")
             bb.note('Running %s' % cmd)