[oe-commits] [openembedded-core] 01/06: package_manager.py: Allow a leading - in PACKAGE_EXCLUDE_COMPLEMENTARY

[git at git.openembedded.org]

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit ac4ca41d3a27356d46c0c39053e74d3519b24c44
Author: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
AuthorDate: Wed Oct 5 17:30:45 2016 +0200

    package_manager.py: Allow a leading - in PACKAGE_EXCLUDE_COMPLEMENTARY
    
    This allows a regular expression specified in
    PACKAGE_EXCLUDE_COMPLEMENTARY to have a leading dash. Without this,
    the dash was treated by oe-pkgdata-util as the beginning of a command
    line argument. E.g., if PACKAGE_EXCLUDE_COMPLEMENTARY = "-foo$", it
    resulted in an error like:
    
      ERROR: <imagename>-1.0-r0 do_populate_sdk: Could not compute
      complementary packages list. Command '<topdir>/scripts/oe-pkgdata-util -p
      <builddir>/tmp/sysroots/<machine>/pkgdata glob
      <workdir>/installed_pkgs.txt *-dev *-dbg -x -foo$' returned 2:
      ERROR: argument -x/--exclude: expected one argument
      usage: oe-pkgdata-util glob [-h] [-x EXCLUDE] pkglistfile glob [glob ...]
    
    Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt at axis.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/package_manager.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 434b898..5f86aff 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(['-x', exclude])
+            cmd.extend(['--exclude=' + exclude])
         try:
             bb.note("Installing complementary packages ...")
             bb.note('Running %s' % cmd)

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.