diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package_manager/__init__.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py index 42225a3b2e..8e7128b195 100644 --- a/meta/lib/oe/package_manager/__init__.py +++ b/meta/lib/oe/package_manager/__init__.py | |||
@@ -328,7 +328,11 @@ class PackageManager(object, metaclass=ABCMeta): | |||
328 | try: | 328 | try: |
329 | bb.note("Installing globbed packages...") | 329 | bb.note("Installing globbed packages...") |
330 | cmd = ["oe-pkgdata-util", "-p", pkgdatadir, "list-pkgs", globs] | 330 | cmd = ["oe-pkgdata-util", "-p", pkgdatadir, "list-pkgs", globs] |
331 | pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") | 331 | bb.note('Running %s' % cmd) |
332 | proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) | ||
333 | stdout, stderr = proc.communicate() | ||
334 | if stderr: bb.note(stderr.decode("utf-8")) | ||
335 | pkgs = stdout.decode("utf-8") | ||
332 | self.install(pkgs.split(), attempt_only=True) | 336 | self.install(pkgs.split(), attempt_only=True) |
333 | except subprocess.CalledProcessError as e: | 337 | except subprocess.CalledProcessError as e: |
334 | # Return code 1 means no packages matched | 338 | # Return code 1 means no packages matched |
@@ -384,7 +388,10 @@ class PackageManager(object, metaclass=ABCMeta): | |||
384 | cmd.extend(['--exclude=' + '|'.join(exclude.split())]) | 388 | cmd.extend(['--exclude=' + '|'.join(exclude.split())]) |
385 | try: | 389 | try: |
386 | bb.note('Running %s' % cmd) | 390 | bb.note('Running %s' % cmd) |
387 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") | 391 | proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE) |
392 | stdout, stderr = proc.communicate() | ||
393 | if stderr: bb.note(stderr.decode("utf-8")) | ||
394 | complementary_pkgs = stdout.decode("utf-8") | ||
388 | complementary_pkgs = set(complementary_pkgs.split()) | 395 | complementary_pkgs = set(complementary_pkgs.split()) |
389 | skip_pkgs = sorted(complementary_pkgs & provided_pkgs) | 396 | skip_pkgs = sorted(complementary_pkgs & provided_pkgs) |
390 | install_pkgs = sorted(complementary_pkgs - provided_pkgs) | 397 | install_pkgs = sorted(complementary_pkgs - provided_pkgs) |