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 b74c8599eb..8954338347 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py | |||
| @@ -594,7 +594,7 @@ class PackageManager(object, metaclass=ABCMeta): | |||
| 594 | installed_pkgs.write(output) | 594 | installed_pkgs.write(output) |
| 595 | installed_pkgs.flush() | 595 | installed_pkgs.flush() |
| 596 | 596 | ||
| 597 | cmd = [bb.utils.which(os.getenv('PATH'), "oe-pkgdata-util"), | 597 | cmd = ["oe-pkgdata-util", |
| 598 | "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs.name, | 598 | "-p", self.d.getVar('PKGDATA_DIR', True), "glob", installed_pkgs.name, |
| 599 | globs] | 599 | globs] |
| 600 | exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) | 600 | exclude = self.d.getVar('PACKAGE_EXCLUDE_COMPLEMENTARY', True) |
| @@ -604,11 +604,11 @@ class PackageManager(object, metaclass=ABCMeta): | |||
| 604 | bb.note("Installing complementary packages ...") | 604 | bb.note("Installing complementary packages ...") |
| 605 | bb.note('Running %s' % cmd) | 605 | bb.note('Running %s' % cmd) |
| 606 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") | 606 | complementary_pkgs = subprocess.check_output(cmd, stderr=subprocess.STDOUT).decode("utf-8") |
| 607 | self.install(complementary_pkgs.split(), attempt_only=True) | ||
| 607 | except subprocess.CalledProcessError as e: | 608 | except subprocess.CalledProcessError as e: |
| 608 | bb.fatal("Could not compute complementary packages list. Command " | 609 | bb.fatal("Could not compute complementary packages list. Command " |
| 609 | "'%s' returned %d:\n%s" % | 610 | "'%s' returned %d:\n%s" % |
| 610 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) | 611 | (' '.join(cmd), e.returncode, e.output.decode("utf-8"))) |
| 611 | self.install(complementary_pkgs.split(), attempt_only=True) | ||
| 612 | 612 | ||
| 613 | def deploy_dir_lock(self): | 613 | def deploy_dir_lock(self): |
| 614 | if self.deploy_dir is None: | 614 | if self.deploy_dir is None: |
