From: Rouven Czerwinski Date: Mon, 1 Jun 2026 07:13:05 +0000 (+0200) Subject: package_manager: remove [True, False] list eval X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=24eb81273c4b97a27bd50b86084f5fff03d2c46a;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git package_manager: remove [True, False] list eval Remove a [True, False] list evaluation that itself relied on evaluating a boolean condition. Instead pass the boolean condition directly. The previous version works because int(True)=1 and int(False)=0. So: => pkg_type = Manifest.PKG_TYPE_ATTEMPT_ONLY => [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY] => [False, True][True] => [False, True][1] => True No functional changes. Signed-off-by: Rouven Czerwinski Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py index 21d6cc5e5d..d2b077cc37 100644 --- a/meta/lib/oe/package_manager/deb/rootfs.py +++ b/meta/lib/oe/package_manager/deb/rootfs.py @@ -165,7 +165,7 @@ class PkgRootfs(DpkgOpkgRootfs): for pkg_type in Manifest.INSTALL_ORDER: if pkg_type in pkgs_to_install: self.pm.install(pkgs_to_install[pkg_type], - [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) + pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY) self.pm.fix_broken_dependencies() if self.progress_reporter: diff --git a/meta/lib/oe/package_manager/deb/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py index 1169744674..46dcc16cc7 100644 --- a/meta/lib/oe/package_manager/deb/sdk.py +++ b/meta/lib/oe/package_manager/deb/sdk.py @@ -57,7 +57,7 @@ class PkgSdk(Sdk): for pkg_type in Manifest.INSTALL_ORDER: if pkg_type in pkgs_to_install: pm.install(pkgs_to_install[pkg_type], - [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) + pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY) def _populate(self): execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND")) diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py index bc822bac87..a760000d3f 100644 --- a/meta/lib/oe/package_manager/ipk/rootfs.py +++ b/meta/lib/oe/package_manager/ipk/rootfs.py @@ -307,7 +307,7 @@ class PkgRootfs(DpkgOpkgRootfs): self._multilib_test_install(pkgs_to_install[pkg_type]) self.pm.install(pkgs_to_install[pkg_type], - [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) + pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY) if self.progress_reporter: self.progress_reporter.next_stage() diff --git a/meta/lib/oe/package_manager/ipk/sdk.py b/meta/lib/oe/package_manager/ipk/sdk.py index c39a32fa24..9a7ff9f0c9 100644 --- a/meta/lib/oe/package_manager/ipk/sdk.py +++ b/meta/lib/oe/package_manager/ipk/sdk.py @@ -53,7 +53,7 @@ class PkgSdk(Sdk): for pkg_type in Manifest.INSTALL_ORDER: if pkg_type in pkgs_to_install: pm.install(pkgs_to_install[pkg_type], - [False, True][pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY]) + pkg_type == Manifest.PKG_TYPE_ATTEMPT_ONLY) def _populate(self): execute_pre_post_process(self.d, self.d.getVar("POPULATE_SDK_PRE_TARGET_COMMAND"))