From aa051a5b4c913eb1f21b2fb06d1130bfef472344 Mon Sep 17 00:00:00 2001 From: Shad L. Lords Date: Mon, 26 Oct 2009 18:57:33 -0600 Subject: [PATCH] Progress window for install/upgrade --- kickstart.py | 3 +++ packages.py | 7 ++++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/kickstart.py b/kickstart.py index c4b67a6..26b8b4a 100644 --- a/kickstart.py +++ b/kickstart.py @@ -99,6 +99,9 @@ class KickstartBase(BaseInstallClass): name = "kickstart" def postAction(self, rootPath, serial, intf): + win = intf.waitWindow(_("Post Install Script"), + _("The post installation script is running...")) + log("Running kickstart %%post script(s)") for script in self.postScripts: script.run(rootPath, serial) diff --git a/packages.py b/packages.py index 48827d8..73f2c9e 100644 --- a/packages.py +++ b/packages.py @@ -1149,15 +1149,16 @@ def doPostInstall(method, id, intf, instPath): if flags.test: return - w = intf.progressWindow(_("Post Install"), - _("Performing post install configuration..."), 6) - upgrade = id.upgrade.get() arch = iutil.getArch () if upgrade: + w = intf.progressWindow(_("Post Upgrade"), + _("Performing post upgrade configuration..."), 6) logname = '/root/upgrade.log' else: + w = intf.progressWindow(_("Post Install"), + _("Performing post install configuration..."), 6) logname = '/root/install.log' instLogName = instPath + logname -- 1.5.5.6