From ac4ca41d3a27356d46c0c39053e74d3519b24c44 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Wed, 5 Oct 2016 17:30:45 +0200 Subject: 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: -1.0-r0 do_populate_sdk: Could not compute complementary packages list. Command '/scripts/oe-pkgdata-util -p /tmp/sysroots//pkgdata glob /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 Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'meta/lib') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 434b898d3d..5f86affab2 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) -- cgit v1.2.3