Yedidyah Bar David has uploaded a new change for review. Change subject: packaging: setup: update remote DB interactive messages ......................................................................
packaging: setup: update remote DB interactive messages Change-Id: I79cd3479c7a16de011e637bd3395b6af99d14b88 Bug-Url: https://bugzilla.redhat.com/1040938 Signed-off-by: Alex Lourie <alou...@redhat.com> --- M packaging/legacy-setup/common_utils.py M packaging/legacy-setup/ovirt-engine-dwh-setup.py 2 files changed, 24 insertions(+), 17 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/87/23187/1 diff --git a/packaging/legacy-setup/common_utils.py b/packaging/legacy-setup/common_utils.py index 89a1841..688b82a 100755 --- a/packaging/legacy-setup/common_utils.py +++ b/packaging/legacy-setup/common_utils.py @@ -380,17 +380,22 @@ to answer "yes/no" to a given question ''' message = StringIO() + ask_string = question if yesNo: options = '(yes|no)' - ask_string = "{question} {options}: ".format( - question=question, - options=options, - ) + if options: + ask_string = "{ask_string} {options}".format( + ask_string=ask_string, + options=options, + ) if default is not '': ask_string = '{ask_string} [{default}]'.format( ask_string=ask_string, default=default, ) + ask_string = '{ask_string}: '.format( + ask_string=ask_string, + ) logging.debug("asking user: %s" % ask_string) message.write(ask_string) message.seek(0) diff --git a/packaging/legacy-setup/ovirt-engine-dwh-setup.py b/packaging/legacy-setup/ovirt-engine-dwh-setup.py index 362ef9b..73ebb87 100755 --- a/packaging/legacy-setup/ovirt-engine-dwh-setup.py +++ b/packaging/legacy-setup/ovirt-engine-dwh-setup.py @@ -133,7 +133,7 @@ return (options, args) -@transactionDisplay("Creating DB") +@transactionDisplay("Creating DB Schema") def createDbSchema(db_dict): """ create fresh ovirt_engine_history db @@ -194,7 +194,7 @@ os.chdir(currDir) raise -def getPassFromUser(prompt): +def getPassFromUser(prompt, validate=True): """ get a single password from the user """ @@ -203,16 +203,17 @@ print "Cannot accept an empty password" return getPassFromUser(prompt) - try: - cracklib.FascistCheck(userInput) - except: - print "Warning: Weak Password." + if validate: + try: + cracklib.FascistCheck(userInput) + except: + print "Warning: Weak Password." - # We do not need verification for the re-entered password - userInput2 = getpass.getpass("Re-type password: ") - if userInput != userInput2: - print "ERROR: passwords don't match" - return getPassFromUser(prompt) + # We do not need verification for the re-entered password + userInput2 = getpass.getpass("Re-type password: ") + if userInput != userInput2: + print "ERROR: passwords don't match" + return getPassFromUser(prompt) return userInput @@ -231,12 +232,13 @@ ) dbuser = utils.askQuestion( - question='Provide a remote DB user: ', + question='Database user', default=userdefault, ) userInput = getPassFromUser( - prompt='Please choose a password for the db user: ' + prompt='Database password: ', + validate=False, ) return (dbuser, userInput) -- To view, visit http://gerrit.ovirt.org/23187 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I79cd3479c7a16de011e637bd3395b6af99d14b88 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-dwh 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
