From 058119da17c3ceb35d5b9f106f410320bdf3986b Mon Sep 17 00:00:00 2001 From: Joe Slater Date: Thu, 21 Jun 2018 11:22:17 -0700 Subject: postinst-intercepts: do not execute any variant of delay_to_first_boot As of commit 2c5c6e3ff we create multilib variants of intercept hooks but we did not account for delay_to_first_boot variants. This was covered up until commit a335e7867, but will now cause an error. (From OE-Core rev: 77f7c75481dceec36b7373f277c3bac811de9ef2) Signed-off-by: Joe Slater Signed-off-by: Richard Purdie --- meta/lib/oe/package_manager.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'meta/lib/oe/package_manager.py') diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py index 20a41d53f8..9aa5847c8a 100644 --- a/meta/lib/oe/package_manager.py +++ b/meta/lib/oe/package_manager.py @@ -382,7 +382,8 @@ class PackageManager(object, metaclass=ABCMeta): if script == "postinst_intercept" or not os.access(script_full, os.X_OK): continue - if script == "delay_to_first_boot": + # we do not want to run any multilib variant of this + if script.startswith("delay_to_first_boot"): self._postpone_to_first_boot(script_full) continue -- cgit v1.2.3-54-g00ecf