[oe-commits] [openembedded-core] 02/09: postinst-intercepts: do not execute any variant of delay_to_first_boot

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

rpurdie pushed a commit to branch master-next
in repository openembedded-core.

commit 77f7c75481dceec36b7373f277c3bac811de9ef2
Author: Joe Slater <joe.slater at windriver.com>
AuthorDate: Thu Jun 21 11:22:17 2018 -0700

    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.
    
    Signed-off-by: Joe Slater <joe.slater at windriver.com>
    Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
 meta/lib/oe/package_manager.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index 20a41d5..9aa5847 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
 

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.