diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/lib/oe/package_manager.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 13577b18bd..d6a04089ba 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -593,7 +593,7 @@ class PackageManager(object, metaclass=ABCMeta): | |||
593 | if globs is None: | 593 | if globs is None: |
594 | return | 594 | return |
595 | 595 | ||
596 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), | 596 | cmd = ["oe-pkgdata-util", |
597 | "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, | 597 | "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, |
598 | globs] | 598 | globs] |
599 | exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) | 599 | exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) |
@@ -603,11 +603,11 @@ class PackageManager(object, metaclass=ABCMeta): | |||
603 | bb.note("Installing complementary packages ...") | 603 | bb.note("Installing complementary packages ...") |
604 | bb.note('Running %s' % cmd) | 604 | bb.note('Running %s' % cmd) |
605 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") | 605 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") |
606 | self.install(complementary_pkgs.split(), attempt_only=True) | ||
606 | except subprocess.CalledProcessError as e: | 607 | except subprocess.CalledProcessError as e: |
607 | bb.fatal("Could not compute complementary packages list. Command " | 608 | bb.fatal("Could not compute complementary packages list. Command " |
608 | "'%s' returned %d:\n%s" % | 609 | "'%s' returned %d:\n%s" % |
609 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) | 610 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) |
610 | self.install(complementary_pkgs.split(), attempt_only=True) | ||
611 | os.remove(installed_pkgs_file) | 611 | os.remove(installed_pkgs_file) |
612 | 612 | ||
613 | def deploy_dir_lock(self): | 613 | def deploy_dir_lock(self): |