Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: use engine package env for versionlock ......................................................................
packaging: setup: use engine package env for versionlock Compliment Ibad05b1e0283b0b27fb278a0ba15b3f7e95d747c Related-To: https://bugzilla.redhat.com/1076046 Change-Id: I5bcd649ee872269b9e687e0517a5b6de6f81284d Signed-off-by: Yedidyah Bar David <d...@redhat.com> --- M packaging/setup/ovirt_engine_setup/constants.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/distro-rpm/packages.py 2 files changed, 26 insertions(+), 16 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/00/26100/1 diff --git a/packaging/setup/ovirt_engine_setup/constants.py b/packaging/setup/ovirt_engine_setup/constants.py index 69e4914..9a844ab 100644 --- a/packaging/setup/ovirt_engine_setup/constants.py +++ b/packaging/setup/ovirt_engine_setup/constants.py @@ -601,20 +601,16 @@ UPGRADE_YUM_GROUP_NAME = 'ovirt-engine-3.4' @classproperty - def RPM_LOCK_LIST(self): - return tuple([ - '{name}%s'.format( - name=self.ENGINE_PACKAGE_NAME, - ) % package for package in ( - '', - '-backend', - '-dbscripts', - '-restapi', - '-tools', - '-userportal', - '-webadmin-portal', - ) - ]) + def RPM_LOCK_LIST_SUFFIXES(self): + return ( + '', + '-backend', + '-dbscripts', + '-restapi', + '-tools', + '-userportal', + '-webadmin-portal', + ) FILE_GROUP_SECTION_PREFIX = 'file_group_' 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 1ffa976..db4993d 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 @@ -58,10 +58,24 @@ self.environment[ osetupcons.RPMDistroEnv.VERSION_LOCK_FILTER - ].append(osetupcons.Const.ENGINE_PACKAGE_NAME) + ].extend( + tolist( + self.environment[osetupcons.RPMDistroEnv.ENGINE_PACKAGES] + ) + ) self.environment[ osetupcons.RPMDistroEnv.VERSION_LOCK_APPLY - ].extend(osetupcons.Const.RPM_LOCK_LIST) + ].extend( + [ + "%s%s" % (prefix, suffix) + for prefix in tolist( + self.environment[ + osetupcons.RPMDistroEnv.ENGINE_PACKAGES + ] + ) + for suffix in osetupcons.Const.RPM_LOCK_LIST_SUFFIXES + ] + ) self.environment[ osetupcons.RPMDistroEnv.PACKAGES_UPGRADE_LIST ].append( -- To view, visit http://gerrit.ovirt.org/26100 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I5bcd649ee872269b9e687e0517a5b6de6f81284d Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Yedidyah Bar David <d...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
