Re: [f17-branch] add a dialog while running convertfs (#812144)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



> 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."

Hm, I wonder if different language would be better in both of these
places.  I don't know that "convertfs" really means anything to the
user.

- Chris

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


[Index of Archives]     [Kickstart]     [Fedora Users]     [Fedora Legacy List]     [Fedora Maintainers]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [Yosemite Photos]     [KDE Users]     [Fedora Tools]
  Powered by Linux