Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: Do not read ovirt-engine.rpmsave ......................................................................
packaging: setup: Do not read ovirt-engine.rpmsave Change-Id: Ibf8a297afdc8bde2442c3874c2bbfed82651aa78 Signed-off-by: Yedidyah Bar David <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/legacy/config.py 1 file changed, 8 insertions(+), 13 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/46/17846/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py b/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py index 8e00e93..91f556a 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py +++ b/packaging/setup/plugins/ovirt-engine-setup/legacy/config.py @@ -55,19 +55,14 @@ def _customization(self): legacy = osetupcons.FileLocations.LEGACY_OVIRT_ENGINE_SYSCONFIG config = None - for filename in ( - legacy, - legacy + '.rpmsave', - ): - if os.path.exists(filename): - self.logger.debug('Upgrading from 3.2.z') - self.environment[ - osetupcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION - ] = True - config = configfile.ConfigFile([ - filename, - ]) - break + if os.path.exists(legacy): + self.logger.debug('Upgrading from 3.2.z') + self.environment[ + osetupcons.ApacheEnv.CONFIGURE_ROOT_REDIRECTION + ] = True + config = configfile.ConfigFile([ + legacy, + ]) if config is None: self.logger.debug('Upgrading from 3.3.z legacy') config = configfile.ConfigFile([ -- To view, visit http://gerrit.ovirt.org/17846 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ibf8a297afdc8bde2442c3874c2bbfed82651aa78 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
