Alex Lourie 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/ovirt-engine-dwh-setup.py
1 file changed, 14 insertions(+), 12 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-dwh refs/changes/55/22555/1

diff --git a/packaging/ovirt-engine-dwh-setup.py 
b/packaging/ovirt-engine-dwh-setup.py
index b2ceebe..8fc1c14 100755
--- a/packaging/ovirt-engine-dwh-setup.py
+++ b/packaging/ovirt-engine-dwh-setup.py
@@ -140,7 +140,7 @@
     else:
         return True
 
-@transactionDisplay("Creating DB")
+@transactionDisplay("Creating DB Schema")
 def createDbSchema(db_dict):
     """
     create fresh ovirt_engine_history db
@@ -201,7 +201,7 @@
         os.chdir(currDir)
         raise
 
-def getPassFromUser(prompt):
+def getPassFromUser(prompt, validate=True):
     """
     get a single password from the user
     """
@@ -210,16 +210,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
 
@@ -243,7 +244,8 @@
     )
 
     userInput = getPassFromUser(
-        prompt='Please choose a password for the db user: '
+        prompt='Please choose a password for the db user: ',
+        validate=False,
     )
 
     return (dbuser, userInput)


-- 
To view, visit http://gerrit.ovirt.org/22555
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79cd3479c7a16de011e637bd3395b6af99d14b88
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-dwh
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Alex Lourie <alou...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to