Merge branch 'master' of git.calculate.ru:calculate-install

pym/cl_install.py

@@ -1113,8 +1113,8 @@ class cl_install(color_print):
     def getPwdHashUser(self, userName):
         cl_overriding.printSUCCESS(_("Enter password for user %s") %userName)
         userPwd = getUserPassword()
-        if userPwd is False:
-            return False
+        while userPwd is False:
+            userPwd = getUserPassword()
         encryptObj = encrypt()
         pwdHash = encryptObj.getHashPasswd(userPwd, "shadow_ssha256")
         if pwdHash is False: