diff options
| author | Jeremy Katz <katzj@redhat.com> | 2006-08-09 14:41:01 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2006-08-09 14:41:01 +0000 |
| commit | ce195954e3aa9c35b43a04b4780ca0de6634a88e (patch) | |
| tree | 7047634861807a810a670e599e5545187e072b6a /installclasses | |
| parent | 0c3d2b7f75dd9dc0c4308cf0986cae43bdc41c4d (diff) | |
| download | anaconda-ce195954e3aa9c35b43a04b4780ca0de6634a88e.tar.gz anaconda-ce195954e3aa9c35b43a04b4780ca0de6634a88e.tar.xz anaconda-ce195954e3aa9c35b43a04b4780ca0de6634a88e.zip | |
2006-08-09 Jeremy Katz <katzj@redhat.com>
* installclasses/rhel.py (InstallClass.handleRegKey): Add a few
more options, check for validity of option (#201738)
Diffstat (limited to 'installclasses')
| -rw-r--r-- | installclasses/rhel.py | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/installclasses/rhel.py b/installclasses/rhel.py index 04ab4b314..86b8704f7 100644 --- a/installclasses/rhel.py +++ b/installclasses/rhel.py @@ -1,4 +1,5 @@ from installclass import BaseInstallClass +import rhpl from rhpl.translate import N_ from constants import * import os @@ -45,25 +46,32 @@ class InstallClass(BaseInstallClass): return rc def handleRegKey(self, key, intf): - if key is None or len(key) == 0: - intf.messageWindow(_("Registration Key Required"), - _("A registration key is required to " - "install %s. Please contact your support " - "representative if you did not receive a " - "key with your product." %(productName,)), - type = "ok", custom_icon="error") - raise NoKeyError +# if key is None or len(key) == 0: +# intf.messageWindow(_("Registration Key Required"), +# _("A registration key is required to " +# "install %s. Please contact your support " +# "representative if you did not receive a " +# "key with your product." %(productName,)), +# type = "ok", custom_icon="error") +# raise NoKeyError # simple and stupid for now... if C is in the key, add Clustering # if V is in the key, add Virtualization. - if key.find("C") != -1: - self.repopaths["cluster"] = "Cluster" - if key.find("S") != -1: - self.repopaths["cs"] = "ClusterStorage" - if key.find("V") != -1: - self.repopaths["virt"] = "VT" - if key.find("D") != -1: - self.repopaths["desktop"] = "Desktop" + if productPath == "Server": + if key.find("C") != -1: + self.repopaths["cluster"] = "Cluster" + if key.find("S") != -1: + self.repopaths["cs"] = "ClusterStorage" + + if productPath == "Client": + if key.find("D") != -1: + self.repopaths["desktop"] = "Desktop" + if key.find("W") != -1: + self.repopaths["desktop"] = "Workstation" + + if rhpl.getArch() in ("i386", "x86_64", "ia64"): + if key.find("V") != -1: + self.repopaths["virt"] = "VT" self.regkey = key |