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/sdk.py | 2 +- meta/lib/oe/package_manager/ipk/sdk.py | 2 +- meta/lib/oe/sdk.py | 2 -- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/lib/oe/package_manager/deb/sdk.py b/meta/lib/oe/package_manager/deb/sdk.py index 6f3005053e..1169744674 100644 --- a/meta/lib/oe/package_manager/deb/sdk.py +++ b/meta/lib/oe/package_manager/deb/sdk.py @@ -54,7 +54,7 @@ class PkgSdk(Sdk): pm.write_index() pm.update() - for pkg_type in self.install_order: + 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]) diff --git a/meta/lib/oe/package_manager/ipk/sdk.py b/meta/lib/oe/package_manager/ipk/sdk.py index 3acd55f548..c39a32fa24 100644 --- a/meta/lib/oe/package_manager/ipk/sdk.py +++ b/meta/lib/oe/package_manager/ipk/sdk.py @@ -50,7 +50,7 @@ class PkgSdk(Sdk): pm.update() - for pkg_type in self.install_order: + 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]) diff --git a/meta/lib/oe/sdk.py b/meta/lib/oe/sdk.py index 9fe0fbb752..c2c5431c0d 100644 --- a/meta/lib/oe/sdk.py +++ b/meta/lib/oe/sdk.py @@ -29,8 +29,6 @@ class Sdk(object, metaclass=ABCMeta): self.remove(self.sdk_output, True) - self.install_order = Manifest.INSTALL_ORDER - @abstractmethod def _populate(self): pass -- 2.52.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#237823): https://lists.openembedded.org/g/openembedded-core/message/237823 Mute This Topic: https://lists.openembedded.org/mt/119586920/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
