From e70f9cd242e4470b741cc0e4d4c874ea61596609 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Thu, 1 Mar 2018 18:26:29 +0000 Subject: package_manager: improve install_complementary - No need to use bb.utils.which() as subprocess will search $PATH - Clarity flow by moving the install inside the try/except (From OE-Core rev: f4d22b7195dd8f08fe26dd353c7e860208e87d6a) (From OE-Core rev: b5ef0199e3d95a41d4b8d2678bc7f5c80a53e0a6) Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 4 ++-- 1 file 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): if globs is None: return - cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), + cmd = ["oe-pkgdata-util", "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs_file, globs] exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) @@ -603,11 +603,11 @@ class PackageManager(object, metaclass=ABCMeta): bb.note("Installing complementary packages ...") bb.note('Running %s' % cmd) complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") + self.install(complementary_pkgs.split(), attempt_only=True) except subprocess.CalledProcessError as e: bb.fatal("Could not compute complementary packages list. Command " "'%s' returned %d:\n%s" % (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) - self.install(complementary_pkgs.split(), attempt_only=True) os.remove(installed_pkgs_file) def deploy_dir_lock(self): -- cgit v1.2.3-54-g00ecf