Alon Bar-Lev has uploaded a new change for review. Change subject: packaging: setup: put uninstall files in own group ......................................................................
packaging: setup: put uninstall files in own group Change-Id: I8a06ca7eb902f0bed9c145d5633985018350d088 Signed-off-by: Alon Bar-Lev <[email protected]> --- M packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/jboss.py M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py 4 files changed, 32 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/82/23782/1 diff --git a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py index 2758742..e9bf710 100644 --- a/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py +++ b/packaging/setup/plugins/ovirt-engine-common/ovirt-engine-dwh/core/misc.py @@ -45,6 +45,13 @@ ) def _setup(self): self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].createGroup( + group='ovirt_dwh_files', + description='DWH files', + optional=True, + ) + self.environment[ osetupcons.CoreEnv.SETUP_ATTRS_MODULES ].append(odwhcons) self.logger.debug( diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py index ecd3c2a..706f145 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/config.py @@ -100,6 +100,13 @@ condition=lambda self: self.environment[odwhcons.CoreEnv.ENABLE], ) def _misc(self): + uninstall_files = [] + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].addFiles( + group='ovirt_dwh_files', + fileList=uninstall_files, + ) self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=( @@ -135,9 +142,7 @@ ], ), ), - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], + modifiedList=uninstall_files, ) ) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/jboss.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/jboss.py index 4072cde..68cdc35 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/jboss.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/core/jboss.py @@ -44,6 +44,13 @@ stage=plugin.Stages.STAGE_MISC, ) def _misc(self): + uninstall_files = [] + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].addFiles( + group='ovirt_dwh_files', + fileList=uninstall_files, + ) self.environment[otopicons.CoreEnv.MAIN_TRANSACTION].append( filetransaction.FileTransaction( name=( @@ -57,9 +64,7 @@ ], ), ], - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], + modifiedList=uninstall_files, ) ) diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py index 5b8956a..9e6ec01 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-dwh/legacy/config.py @@ -32,6 +32,7 @@ from ovirt_engine import configfile +from ovirt_engine_setup import constants as osetupcons from ovirt_engine_setup import dwhconstants as odwhcons from ovirt_engine_setup import database @@ -97,6 +98,13 @@ if legacy.get(old) != current.get(new): fixups.append('%s="%s"' % (new, legacy.get(old))) if fixups: + uninstall_files = [] + self.environment[ + osetupcons.CoreEnv.REGISTER_UNINSTALL_GROUPS + ].addFiles( + group='ovirt_dwh_files', + fileList=uninstall_files, + ) self.environment[ otopicons.CoreEnv.MAIN_TRANSACTION ].append( @@ -106,9 +114,7 @@ OVIRT_ENGINE_DWHD_SERVICE_CONFIG_LEGACY ), content=fixups, - modifiedList=self.environment[ - otopicons.CoreEnv.MODIFIED_FILES - ], + modifiedList=uninstall_files, ) ) -- To view, visit http://gerrit.ovirt.org/23782 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8a06ca7eb902f0bed9c145d5633985018350d088 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh Gerrit-Branch: master Gerrit-Owner: Alon Bar-Lev <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
