Sandro Bonazzola has uploaded a new change for review. Change subject: packaging: setup: engine-cleanup refuses to remove a different version ......................................................................
packaging: setup: engine-cleanup refuses to remove a different version engine-cleanup should refuse to remove a version of the engine where the x or y version number are different or where the z is major Change-Id: I06b0d3437bfca4f4e63be4c212f15e98f5617bfd Bug-Url: https://bugzilla.redhat.com/1118360 Signed-off-by: Simone Tiraboschi <stira...@redhat.com> (cherry picked from commit e0f57f0ae5887da0148fc8528a1a32851ec4ac36) --- M packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py 1 file changed, 30 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/50/30750/1 diff --git a/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py b/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py index 7d8d8b5..c6ed7df 100644 --- a/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-remove/base/core/misc.py @@ -27,6 +27,7 @@ from otopi import constants as otopicons from otopi import util from otopi import plugin +import distutils.version from ovirt_engine_setup import constants as osetupcons @@ -95,6 +96,35 @@ _('Could not detect product setup') ) + rpm_v = distutils.version.LooseVersion( + osetupcons.Const.RPM_VERSION + ).version + inst_v = distutils.version.LooseVersion( + self.environment[ + osetupcons.CoreEnv.ORIGINAL_GENERATED_BY_VERSION + ] + ).version + + if (rpm_v[:2] != inst_v[:2]) or (rpm_v < inst_v): + self.logger.error( + _('Cleanup utility and installed version mismatch') + ) + self.dialog.note( + text=_( + 'Please use a version of cleanup utility ' + 'that matches the engine installed version ' + '(now engine-cleanup {r_version}, engine {i_version})' + ).format( + r_version=osetupcons.Const.RPM_VERSION, + i_version=self.environment[ + osetupcons.CoreEnv.ORIGINAL_GENERATED_BY_VERSION + ], + ) + ) + raise RuntimeError( + _('Cleanup utility version mismatch') + ) + @plugin.event( stage=plugin.Stages.STAGE_CUSTOMIZATION, name=osetupcons.Stages.REMOVE_CUSTOMIZATION_COMMON, -- To view, visit http://gerrit.ovirt.org/30750 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I06b0d3437bfca4f4e63be4c212f15e98f5617bfd Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Sandro Bonazzola <sbona...@redhat.com> Gerrit-Reviewer: Simone Tiraboschi <stira...@redhat.com> _______________________________________________ Engine-patches mailing list Engine-patches@ovirt.org http://lists.ovirt.org/mailman/listinfo/engine-patches
