summaryrefslogtreecommitdiffstats
path: root/packages.py
diff options
context:
space:
mode:
authorJeremy Katz <katzj@redhat.com>2006-10-17 18:43:36 +0000
committerJeremy Katz <katzj@redhat.com>2006-10-17 18:43:36 +0000
commited0c5f8fafab2f3ca41523d62b9bfd132e730286 (patch)
tree81357ec2e4bb2f39f7d96b47132b1e74ed3fe0b2 /packages.py
parent4505a7cbfc280a63578de9bd9aeb174c8a00d764 (diff)
downloadanaconda-ed0c5f8fafab2f3ca41523d62b9bfd132e730286.tar.gz
anaconda-ed0c5f8fafab2f3ca41523d62b9bfd132e730286.tar.xz
anaconda-ed0c5f8fafab2f3ca41523d62b9bfd132e730286.zip
2006-10-17 Jeremy Katz <katzj@redhat.com>
* packages.py (regKeyScreen): Only go back if we can (#211101)
Diffstat (limited to 'packages.py')
-rw-r--r--packages.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/packages.py b/packages.py
index dffe3b4f6..1c66c8119 100644
--- a/packages.py
+++ b/packages.py
@@ -247,9 +247,11 @@ def regKeyScreen(anaconda):
break
rc = anaconda.intf.getInstallKey(anaconda, key)
- if rc is None:
+ if rc is None and anaconda.dispatch.canGoBack():
return DISPATCH_BACK
- if rc == SKIP_KEY:
+ elif rc is None:
+ continue
+ elif rc == SKIP_KEY:
if anaconda.id.instClass.skipkeytext:
rc = anaconda.intf.messageWindow(_("Skip"),
anaconda.id.instClass.skipkeytext,
@@ -262,9 +264,7 @@ def regKeyScreen(anaconda):
key = rc
- # FIXME: currently, we only allow this screen to ever be hit _once_
- anaconda.dispatch.skipStep("regkey", permanent = 1)
- return
+ return DISPATCH_FORWARD
def betaNagScreen(anaconda):
publicBetas = { "Red Hat Linux": "Red Hat Linux Public Beta",