summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/package_manager/__init__.py
diff options
context:
space:
mode:
authorFabio Berton <fbberton@gmail.com>2021-06-28 15:14:27 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-29 22:24:29 +0100
commit1f3094e7756ebd2f9ac527f62de07695b7eeca28 (patch)
tree472a3c5a701a25aeba3af55950ad122d569d369f /meta/lib/oe/package_manager/__init__.py
parentb6cbc055eb42f6d7e1cf9554b51842e2b89215d1 (diff)
downloadpoky-1f3094e7756ebd2f9ac527f62de07695b7eeca28.tar.gz
lib/oe/package_manager: Don't ignore installation failures in install_complementary
When attempt_only flag is set to True all installation failures are ignored. Disable attempt_only, that is the default in install function, to raise error in install_complementary and to prevent do_populate_sdk task to treat errors as warnings. [RP: Historically some of our addtional packages were in bad shape and wouldn't all install. This is no longer the case so we shouldn't need a hack like this any longer.] (From OE-Core rev: 8042ad9ca91ddaaf741366e1068c63c284ff98f5) Signed-off-by: Fabio Berton <fabio.berton@criticaltechworks.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/package_manager/__init__.py')
-rw-r--r--meta/lib/oe/package_manager/__init__.py8
1 files changed, 3 insertions, 5 deletions
diff --git a/meta/lib/oe/package_manager/__init__.py b/meta/lib/oe/package_manager/__init__.py
index 4d22bc0296..de5916d7d8 100644
--- a/meta/lib/oe/package_manager/__init__.py
+++ b/meta/lib/oe/package_manager/__init__.py
@@ -344,10 +344,8 @@ class PackageManager(object, metaclass=ABCMeta):
344 def install_complementary(self, globs=None): 344 def install_complementary(self, globs=None):
345 """ 345 """
346 Install complementary packages based upon the list of currently installed 346 Install complementary packages based upon the list of currently installed
347 packages e.g. locales, *-dev, *-dbg, etc. This will only attempt to install 347 packages e.g. locales, *-dev, *-dbg, etc. Note: every backend needs to
348 these packages, if they don't exist then no error will occur. Note: every 348 call this function explicitly after the normal package installation.
349 backend needs to call this function explicitly after the normal package
350 installation
351 """ 349 """
352 if globs is None: 350 if globs is None:
353 globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY') 351 globs = self.d.getVar('IMAGE_INSTALL_COMPLEMENTARY')
@@ -398,7 +396,7 @@ class PackageManager(object, metaclass=ABCMeta):
398 bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % ( 396 bb.note("Installing complementary packages ... %s (skipped already provided packages %s)" % (
399 ' '.join(install_pkgs), 397 ' '.join(install_pkgs),
400 ' '.join(skip_pkgs))) 398 ' '.join(skip_pkgs)))
401 self.install(install_pkgs, attempt_only=True) 399 self.install(install_pkgs)
402 except subprocess.CalledProcessError as e: 400 except subprocess.CalledProcessError as e:
403 bb.fatal("Could not compute complementary packages list. Command " 401 bb.fatal("Could not compute complementary packages list. Command "
404 "'%s' returned %d:\n%s" % 402 "'%s' returned %d:\n%s" %