1 |
slords |
1.1 |
From aa051a5b4c913eb1f21b2fb06d1130bfef472344 Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Shad L. Lords <slords@mail.com> |
3 |
|
|
Date: Mon, 26 Oct 2009 18:57:33 -0600 |
4 |
|
|
Subject: [PATCH] Progress window for install/upgrade |
5 |
|
|
|
6 |
|
|
--- |
7 |
|
|
kickstart.py | 3 +++ |
8 |
|
|
packages.py | 7 ++++--- |
9 |
|
|
2 files changed, 7 insertions(+), 3 deletions(-) |
10 |
|
|
|
11 |
|
|
diff --git a/kickstart.py b/kickstart.py |
12 |
|
|
index c4b67a6..26b8b4a 100644 |
13 |
|
|
--- a/kickstart.py |
14 |
|
|
+++ b/kickstart.py |
15 |
|
|
@@ -99,6 +99,9 @@ class KickstartBase(BaseInstallClass): |
16 |
|
|
name = "kickstart" |
17 |
|
|
|
18 |
|
|
def postAction(self, rootPath, serial, intf): |
19 |
|
|
+ win = intf.waitWindow(_("Post Install Script"), |
20 |
|
|
+ _("The post installation script is running...")) |
21 |
|
|
+ |
22 |
|
|
log("Running kickstart %%post script(s)") |
23 |
|
|
for script in self.postScripts: |
24 |
|
|
script.run(rootPath, serial) |
25 |
|
|
diff --git a/packages.py b/packages.py |
26 |
|
|
index 48827d8..73f2c9e 100644 |
27 |
|
|
--- a/packages.py |
28 |
|
|
+++ b/packages.py |
29 |
|
|
@@ -1149,15 +1149,16 @@ def doPostInstall(method, id, intf, instPath): |
30 |
|
|
if flags.test: |
31 |
|
|
return |
32 |
|
|
|
33 |
|
|
- w = intf.progressWindow(_("Post Install"), |
34 |
|
|
- _("Performing post install configuration..."), 6) |
35 |
|
|
- |
36 |
|
|
upgrade = id.upgrade.get() |
37 |
|
|
arch = iutil.getArch () |
38 |
|
|
|
39 |
|
|
if upgrade: |
40 |
|
|
+ w = intf.progressWindow(_("Post Upgrade"), |
41 |
|
|
+ _("Performing post upgrade configuration..."), 6) |
42 |
|
|
logname = '/root/upgrade.log' |
43 |
|
|
else: |
44 |
|
|
+ w = intf.progressWindow(_("Post Install"), |
45 |
|
|
+ _("Performing post install configuration..."), 6) |
46 |
|
|
logname = '/root/install.log' |
47 |
|
|
|
48 |
|
|
instLogName = instPath + logname |
49 |
|
|
-- |
50 |
|
|
1.5.5.6 |
51 |
|
|
|