diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-07-24 20:31:20 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-07-24 20:31:20 +0000 |
| commit | 252d611ece0a52b58a10c893bd87f557837ea3b6 (patch) | |
| tree | ba95962b37e80dec683fac1bca2f70db58e76ec6 /packages.py | |
| parent | c08bf557dd26796e78dafe9c51d6cd081ae4f339 (diff) | |
| download | anaconda-252d611ece0a52b58a10c893bd87f557837ea3b6.tar.gz anaconda-252d611ece0a52b58a10c893bd87f557837ea3b6.tar.xz anaconda-252d611ece0a52b58a10c893bd87f557837ea3b6.zip | |
2006-07-24 Jeremy Katz <katzj@redhat.com>
* yuminstall.py (AnacondaYum.doConfigSetup): Allow having more
than one default repo for the installclass
(YumBackend._catchallCategory): Fix catchall category
* packages.py (regKeyScreen): Add reg key screen.
* installclass.py (BaseInstallClass.getPackagePaths): Add method
to handle mapping with a URI to the repo paths we want to have
(BaseInstallClass.handleRegKey): Method for handling the reg key
and validating it
* installclasses/rhel.py: Add Red Hat Enterprise Linux
installclass. Have it enable the regkey step
* installclasses/rhel_as.py: Remove old RHEL class
* installclasses/rhel_desktop.py: Likewise.
* installclasses/rhel_es.py: Likewise.
* installclasses/rhel_ws.py: Likewise.
* gui.py (EntryWindow.__init__): Add intf.entryWindow taking
advantage of messageWindow stuff.
* text.py (InstallInterface.entryWindow): Likewise.
* dispatch.py (installSteps): Add regkey step.
Diffstat (limited to 'packages.py')
| -rw-r--r-- | packages.py | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/packages.py b/packages.py index 4be4e57d4..1f3b67f59 100644 --- a/packages.py +++ b/packages.py @@ -239,6 +239,25 @@ def recreateInitrd (kernelTag, instRoot): stdout = None, stderr = None, searchPath = 1, root = instRoot) +def regKeyScreen(anaconda): + if anaconda.dir == DISPATCH_BACK: + return DISPATCH_NOOP + + while 1: + rc = anaconda.intf.entryWindow(_("Enter Registration Key"), + _("Please enter the registration key for your version of %s.") %(productName,), _("Key:")) + + try: + anaconda.id.instClass.handleRegKey(rc, anaconda.intf) + except Exception, e: + log.info("exception handling regkey: %s" %(e,)) + continue + break + + # FIXME: currently, we only allow this screen to ever be hit _once_ + anaconda.dispatch.skipStep("regkey", permanent = 1) + return + def betaNagScreen(anaconda): publicBetas = { "Red Hat Linux": "Red Hat Linux Public Beta", "Red Hat Enterprise Linux": "Red Hat Enterprise Linux Public Beta", |