diff options
-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 8c567be0f4..d1336d33ac 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
@@ -402,7 +402,7 @@ class PackageManager(object, metaclass=ABCMeta): | |||
402 | installed_pkgs.write(output) | 402 | installed_pkgs.write(output) |
403 | installed_pkgs.flush() | 403 | installed_pkgs.flush() |
404 | 404 | ||
405 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), | 405 | cmd = ["oe-pkgdata-util", |
406 | "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name, | 406 | "-p", self.d.getVar('PKGDATA_DIR'), "glob", installed_pkgs.name, |
407 | globs] | 407 | globs] |
408 | exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY') | 408 | exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY') |
@@ -412,11 +412,11 @@ class PackageManager(object, metaclass=ABCMeta): | |||
412 | bb.note("Installing complementary packages ...") | 412 | bb.note("Installing complementary packages ...") |
413 | bb.note('Running %s' % cmd) | 413 | bb.note('Running %s' % cmd) |
414 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") | 414 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") |
415 | self.install(complementary_pkgs.split(), attempt_only=True) | ||
415 | except subprocess.CalledProcessError as e: | 416 | except subprocess.CalledProcessError as e: |
416 | bb.fatal("Could not compute complementary packages list. Command " | 417 | bb.fatal("Could not compute complementary packages list. Command " |
417 | "'%s' returned %d:\n%s" % | 418 | "'%s' returned %d:\n%s" % |
418 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) | 419 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) |
419 | self.install(complementary_pkgs.split(), attempt_only=True) | ||
420 | 420 | ||
421 | def deploy_dir_lock(self): | 421 | def deploy_dir_lock(self): |
422 | if self.deploy_dir is None: | 422 | if self.deploy_dir is None: |