From: Rouven Czerwinski <[email protected]> The install_order instance variable was only ever set to Manifest.INSTALL_ORDER, modified nowhere and used as is. Instead of using an instance variable use Manifest.INSTALL_ORDER directly to simplify the code for those reading it.
No functional changes. Signed-off-by: Rouven Czerwinski <[email protected]> --- meta/lib/oe/package_manager/deb/rootfs.py | 2 +- meta/lib/oe/package_manager/ipk/rootfs.py | 2 +- meta/lib/oe/rootfs.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/lib/oe/package_manager/deb/rootfs.py b/meta/lib/oe/package_manager/deb/rootfs.py index 1e25b64ed9..21d6cc5e5d 100644 --- a/meta/lib/oe/package_manager/deb/rootfs.py +++ b/meta/lib/oe/package_manager/deb/rootfs.py @@ -162,7 +162,7 @@ class PkgRootfs(DpkgOpkgRootfs): if self.progress_reporter: self.progress_reporter.next_stage() - for pkg_type in self.install_order: + 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]) diff --git a/meta/lib/oe/package_manager/ipk/rootfs.py b/meta/lib/oe/package_manager/ipk/rootfs.py index ba93eb62ea..bc822bac87 100644 --- a/meta/lib/oe/package_manager/ipk/rootfs.py +++ b/meta/lib/oe/package_manager/ipk/rootfs.py @@ -298,7 +298,7 @@ class PkgRootfs(DpkgOpkgRootfs): if self.progress_reporter: self.progress_reporter.next_stage() - for pkg_type in self.install_order: + for pkg_type in Manifest.INSTALL_ORDER: if pkg_type in pkgs_to_install: # For multilib, we perform a sanity test before final install # If sanity test fails, it will automatically do a bb.fatal() diff --git a/meta/lib/oe/rootfs.py b/meta/lib/oe/rootfs.py index 7ef7e71f9e..5eee48f587 100644 --- a/meta/lib/oe/rootfs.py +++ b/meta/lib/oe/rootfs.py @@ -27,8 +27,6 @@ class Rootfs(object, metaclass=ABCMeta): self.logcatcher = logcatcher self.warn_check_regex = r'^(warn|Warn|WARNING:)' - self.install_order = Manifest.INSTALL_ORDER - @abstractmethod def _create(self): pass -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237818): https://lists.openembedded.org/g/openembedded-core/message/237818 Mute This Topic: https://lists.openembedded.org/mt/119586913/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
