Ofer Schreiber has uploaded a new change for review. Change subject: packaging: setup - do not accept non-ascii iso domain name ......................................................................
packaging: setup - do not accept non-ascii iso domain name ISO Domain name must contian only ascii characters. Change-Id: If4caf14c80ebbabef6d565b832e725c7cf88c27c Bug-Url: https://bugzilla.redhat.com/1064373 Signed-off-by: Ofer Schreiber <[email protected]> --- M packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py 1 file changed, 23 insertions(+), 9 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/16/24816/1 diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py index 166addf..eb12f4c 100644 --- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py +++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/config/iso_domain.py @@ -375,15 +375,29 @@ if self.environment[ osetupcons.ConfigEnv.ISO_DOMAIN_NAME ] is None: - self.environment[ - osetupcons.ConfigEnv.ISO_DOMAIN_NAME - ] = self.dialog.queryString( - name='ISO_DOMAIN_NAME', - note=_('Local ISO domain name [@DEFAULT@]: '), - prompt=True, - caseSensitive=True, - default=osetupcons.Defaults.DEFAULT_ISO_DOMAIN_NAME, - ) + validName = False + while not validName: + self.environment[ + osetupcons.ConfigEnv.ISO_DOMAIN_NAME + ] = self.dialog.queryString( + name='ISO_DOMAIN_NAME', + note=_('Local ISO domain name [@DEFAULT@]: '), + prompt=True, + caseSensitive=True, + default=osetupcons.Defaults.DEFAULT_ISO_DOMAIN_NAME, + ) + + try: + self.environment[ + osetupcons.ConfigEnv.ISO_DOMAIN_NAME + ].decode('ascii') + validName = True + except UnicodeDecodeError: + self.logger.error( + _( + 'Domain name must only contain ASCII characters' + ) + ) @plugin.event( stage=plugin.Stages.STAGE_MISC, -- To view, visit http://gerrit.ovirt.org/24816 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If4caf14c80ebbabef6d565b832e725c7cf88c27c Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Ofer Schreiber <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
