Joey Boggs
2011-Aug-05 23:20 UTC
[Ovirt-devel] [PATCH 1/2] update comparison for presenting dowgrade/upgrade/install/reinstall options
rhbz#691679 Signed-off-by: Joey Boggs <jboggs at redhat.com> --- scripts/ovirt-config-installer.py | 16 ++++++++-------- 1 files changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/ovirt-config-installer.py b/scripts/ovirt-config-installer.py index ff2ccc8..cacce5e 100644 --- a/scripts/ovirt-config-installer.py +++ b/scripts/ovirt-config-installer.py @@ -29,6 +29,7 @@ import dbus import fcntl import gudev import PAM +import rpm QUIT_BUTTON = "Quit" BACK_BUTTON = "Back" @@ -299,17 +300,16 @@ class NodeInstallScreen: try: e_version, e_release = get_installed_version_number() e_full_ver = e_version + "-" + e_release - if e_version <= m_version: - if e_release < m_release: - self.menu_list.append(" Upgrade " + e_full_ver + " to " + m_full_ver, 3) - self.menu_list.append(" ", 4) - else: - self.menu_list.append(" Install " + PRODUCT_SHORT + " " + m_full_ver, 1) - self.menu_list.append(" ", 2) + compare = rpm.labelCompare(('1', e_version, e_release), ('1', m_version, m_release)) + if compare == -1: + self.menu_list.append(" Upgrade " + e_full_ver + " to " + m_full_ver, 3) + elif compare == 1: + self.menu_list.append(" Downgrade " + e_full_ver + " to " + m_full_ver, 3) + else: + self.menu_list.append(" Reinstall " + m_full_ver, 3) except: log("unable to get_version_numbers for upgrade") pass - else: self.menu_list.append("Major version upgrades are unsupported, uninstall existing version first", 0) else: -- 1.7.5.4
rhbz#719837 Signed-off-by: Joey Boggs <jboggs at redhat.com> --- scripts/ovirt-config-installer.py | 15 ++++++++++----- 1 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/ovirt-config-installer.py b/scripts/ovirt-config-installer.py index cacce5e..637c64c 100644 --- a/scripts/ovirt-config-installer.py +++ b/scripts/ovirt-config-installer.py @@ -669,16 +669,21 @@ class NodeInstallScreen: def upgrade_node(self): gridform = GridForm(self.screen, "", 2, 2) - gridform.add(Label("Upgrading Hypervisor"), 0, 0, anchorLeft = 1) + # can also cover downgrading/reinstalling so changed to "updating" + gridform.add(Label("Updating Hypervisor"), 0, 0, anchorLeft = 1) progress_bar = Scale(50,100) progress_bar.set(75) gridform.add(progress_bar, 0, 1) gridform.draw() self.screen.refresh() - boot_setup = install.ovirt_boot_setup() - progress_bar.set(100) - self.__current_page = FINISHED_PAGE - return + root_pw_set = password.set_password(self.root_password_1.value(), "root") + if root_pw_set: + admin_pw_set = password.set_password(self.root_password_1.value(), "admin") + if admin_pw_set: + boot_setup = install.ovirt_boot_setup() + progress_bar.set(100) + self.__current_page = FINISHED_PAGE + return def start(self): self.set_console_colors() -- 1.7.5.4