Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Packages management at customization ......................................................................
packaging: setup: Packages management at customization Move engine packages management to customization stage. Do most handling only if engine is enabled. ug-Url: https://bugzilla.redhat.com/1150108 Change-Id: I9ea083958ca3212bc0e36c725dab5966c62e7df1 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py 1 file changed, 42 insertions(+), 34 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/51/37251/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py index 208e698..4a6befc 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py @@ -59,44 +59,18 @@ ) @plugin.event( - stage=plugin.Stages.STAGE_SETUP, + stage=plugin.Stages.STAGE_CUSTOMIZATION, + after=( + oenginecons.Stages.CORE_ENABLE, + ), + before=( + osetupcons.Stages.DISTRO_RPM_PACKAGE_UPDATE_CHECK, + ), ) - def _setup(self): + def _customization(self): def tolist(s): return [e.strip() for e in s.split(',')] - self.environment[ - osetupcons.RPMDistroEnv.VERSION_LOCK_FILTER - ].extend( - tolist( - self.environment[oenginecons.RPMDistroEnv.ENGINE_PACKAGES] - ) - ) - self.environment[ - osetupcons.RPMDistroEnv.VERSION_LOCK_APPLY - ].extend( - [ - '%s%s' % (prefix, suffix) - for prefix in tolist( - self.environment[ - oenginecons.RPMDistroEnv.ENGINE_PACKAGES - ] - ) - for suffix in osetupcons.Const.RPM_LOCK_LIST_SUFFIXES - ] - ) - self.environment[ - osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST - ].append( - { - 'group': self.environment[ - oenginecons.RPMDistroEnv.UPGRADE_YUM_GROUP - ], - 'packages': tolist( - self.environment[oenginecons.RPMDistroEnv.ENGINE_PACKAGES] - ), - }, - ) self.environment[ osetupcons.RPMDistroEnv.PACKAGES_SETUP ].extend( @@ -107,5 +81,39 @@ ) ) + if self.environment[oenginecons.CoreEnv.ENABLE]: + self.environment[ + osetupcons.RPMDistroEnv.VERSION_LOCK_FILTER + ].extend( + tolist( + self.environment[oenginecons.RPMDistroEnv.ENGINE_PACKAGES] + ) + ) + self.environment[ + osetupcons.RPMDistroEnv.VERSION_LOCK_APPLY + ].extend( + [ + '%s%s' % (prefix, suffix) + for prefix in tolist( + self.environment[ + oenginecons.RPMDistroEnv.ENGINE_PACKAGES + ] + ) + for suffix in osetupcons.Const.RPM_LOCK_LIST_SUFFIXES + ] + ) + self.environment[ + osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST + ].append( + { + 'group': self.environment[ + oenginecons.RPMDistroEnv.UPGRADE_YUM_GROUP + ], + 'packages': tolist( + self.environment[oenginecons.RPMDistroEnv.ENGINE_PACKAGES] + ), + }, + ) + # vim: expandtab tabstop=4 shiftwidth=4 -- To view, visit http://gerrit.ovirt.org/37251 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I9ea083958ca3212bc0e36c725dab5966c62e7df1 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
