From: "Brian C. Lane" <bcl@xxxxxxxxxx>
The convertfs script can take a non-trivial amount of time to
run. Let the user know what the system is doing while it is running.
---
pyanaconda/upgrade.py | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/pyanaconda/upgrade.py b/pyanaconda/upgrade.py
index a15f1c2..8555a0c 100644
--- a/pyanaconda/upgrade.py
+++ b/pyanaconda/upgrade.py
@@ -274,12 +274,18 @@ def upgradeUsr(anaconda):
log.info("upgradeusr dirs are already symlinks")
return
+ if anaconda.intf is not None:
+ w = anaconda.intf.waitWindow(_("Upgrade System"),
+ _("Running convertfs"))
+
if iutil.execWithRedirect("/usr/lib/dracut/modules.d/30convertfs/convertfs.sh",
[ROOT_PATH],
stdout="/dev/tty5", stderr="/dev/tty5"):
log.error("convertfs failed")
- rc = anaconda.intf.messageWindow(_("/usr upgrade failed"),
+ if anaconda.intf is not None:
+ w.pop()
+ rc = anaconda.intf.messageWindow(_("/usr upgrade failed"),
_("convertfs failed to upgrade your system to symlink "
"into /usr. This is required for Fedora 17 to work."
" The upgrade cannot continue."
@@ -287,6 +293,9 @@ def upgradeUsr(anaconda):
sys.exit(0)
log.info("convertfs was successful")
+ if anaconda.intf is not None:
+ w.pop()
+
def setSteps(anaconda):
dispatch = anaconda.dispatch
dispatch.reset_scheduling() # scrap what is scheduled
--
1.7.7.6
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
