[OE-core] [PATCH] update-rc.d.bbclass: fix inhibit check

[Phil Blundell]

On Wed, 2014-02-19 at 18:59 +0800, Kai Kang wrote:
> In update-rc.d.bbclass it checks variable INITSCRIPT_PACKAGES to avoid
> inherit this class. But it is wrong logic to check INITSCRIPT_PACKAGES.
> When 'sysvinit' is in 'DISTRO_FEATURES', INITSCRIPT_PACKAGES will not be
> checked.

Er, really?  From the code you quoted...

>      # Check that this class isn't being inhibited (generally, by
>      # systemd.bbclass) before doing any work.
> -    if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) or \
> +    if oe.utils.contains('DISTRO_FEATURES', 'sysvinit', True, False, d) and \
>         not d.getVar("INHIBIT_UPDATERCD_BBCLASS", True):
>          pkgs = d.getVar('INITSCRIPT_PACKAGES', True)
>          if pkgs == None:

... it seems that if sysvinit is in DISTRO_FEATURES then the outer "if"
will evaluate to true and it will indeed proceed to check
INITSCRIPT_PACKAGES in the last quoted line.  Can you clarify what
exactly is wrong here?

p.