[node-patches] Change in ovirt-node[master]: installer: Show correct message on upgrade

[fabiand at fedoraproject.org]

Fabian Deutsch has uploaded a new change for review.

Change subject: installer: Show correct message on upgrade
......................................................................

installer: Show correct message on upgrade

Previously the message that no new password was given and the old would
remain, was shown even if a new password was given.
Now the password is only shown when really no new password is given.

Change-Id: I551de385e8791d4b2e36e5b749ea09e239858955
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M scripts/tui/src/ovirt/node/installer/upgrade_page.py
1 file changed, 6 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/35/12835/1

diff --git a/scripts/tui/src/ovirt/node/installer/upgrade_page.py b/scripts/tui/src/ovirt/node/installer/upgrade_page.py
index 6bf1f5d..e50dca8 100644
--- a/scripts/tui/src/ovirt/node/installer/upgrade_page.py
+++ b/scripts/tui/src/ovirt/node/installer/upgrade_page.py
@@ -76,13 +76,18 @@
             self._model.update(changes)
             up_pw, up_pw_conf = self._model.get("upgrade.password", ""), \
                 self._model.get("upgrade.password_confirmation", "")
+
             if up_pw != up_pw_conf:
                 self.widgets["password.info"].text("")
                 raise exceptions.InvalidData("Passwords must be the same.")
             else:
                 self.widgets["upgrade.password"].valid(True)
                 self.widgets["upgrade.password_confirmation"].valid(True)
-                self.widgets["password.info"].text(self.__no_new_password_msg)
+                self.widgets["password.info"].text("")
+
+                if not up_pw and not up_pw_conf:
+                    msg = self.__no_new_password_msg
+                    self.widgets["password.info"].text(msg)
 
     def on_merge(self, effective_changes):
         changes = self.pending_changes(False)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I551de385e8791d4b2e36e5b749ea09e239858955
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at fedoraproject.org>