FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Debian > Debian User

 
 
LinkBack Thread Tools
 
Old 07-14-2010, 04:14 PM
"Brian C. Lane"
 
Default text.py: do not traceback when can't go back (#598493).

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 07/14/2010 05:24 AM, Ales Kozumplik wrote:
> ---
> pyanaconda/dispatch.py | 3 +++
> pyanaconda/text.py | 7 ++++---
> 2 files changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/pyanaconda/dispatch.py b/pyanaconda/dispatch.py
> index a5e06a9..39aa2d9 100644
> --- a/pyanaconda/dispatch.py
> +++ b/pyanaconda/dispatch.py
> @@ -120,6 +120,9 @@ installSteps = [
> class Dispatcher(object):
>
> def gotoPrev(self):
> + """
> + You should make sure canGoBack() returns True before attempting gotoPrev().
> + """
> self._setDir(DISPATCH_BACK)
> self.moveStep()
>
> diff --git a/pyanaconda/text.py b/pyanaconda/text.py
> index 0c48407..4dc0d18 100644
> --- a/pyanaconda/text.py
> +++ b/pyanaconda/text.py
> @@ -537,14 +537,15 @@ class InstallInterface(InstallInterfaceBase):
>
> lastrc = rc
>
> - if step == -1:
> - if not anaconda.dispatch.canGoBack():
> + if step == -1:
> + if anaconda.dispatch.canGoBack():
> + anaconda.dispatch.gotoPrev()
> + else:
> ButtonChoiceWindow(self.screen, _("Cancelled"),
> _("I can't go to the previous step "
> "from here. You will have to try "
> "again."),
> buttons=[_("OK")])
> - anaconda.dispatch.gotoPrev()
> else:
> anaconda.dispatch.gotoNext()
>

Ack

- --
Brian C. Lane <bcl@redhat.com>
Red Hat / Port Orchard, WA
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.10 (GNU/Linux)

iQEVAwUBTD3iUxF+jBaO/jp/AQKDuQf/SolmxgbbziaNpHmN/swKIgt3nfZtnoUO
AKA16lci57PKxjLthoxacW9HX0nMF+b9IojiUtXRyAeJ5wcPJj 7Hb68AuZcYRTVq
SWiaq5MUkuiYK8PanZ9ARlWm8IAOmDx0jWiIjVsn/kuwteHssrH5JeGRqHFbLDrJ
pm7Sca5UeutljfBaQHPrhgp7GLNbgk3uZoARp8QZSswGUncaic Vlq189hbZIXpNY
PwWnC1romx+GWgLhE5e0tBrbqs7T/zYjAi0FA8OS50tTcWQTctn9TYvAgeE+bg0Q
68o4w27S9ZshcokEHtbT20OGXBnmFfqNx4lul2pRx2MdZdr6p+ n3tA==
=NkAt
-----END PGP SIGNATURE-----

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

Thread Tools




All times are GMT. The time now is 07:36 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org