diff options
author | Ján ONDREJ <ondrejj@salstar.sk> | 2008-06-04 06:38:02 +0000 |
---|---|---|
committer | Ján ONDREJ <ondrejj@salstar.sk> | 2008-06-04 06:38:02 +0000 |
commit | 96d7f3e7e678a8ac9919ce628c2f792d4cb57955 (patch) | |
tree | 71d6ba7f9e48f87f90a8f8d5c8937c229913d6c5 /installclasses | |
parent | e772036e9972589c7808428c9fd00b90b2089a66 (diff) | |
download | anaconda-96d7f3e7e678a8ac9919ce628c2f792d4cb57955.tar.gz anaconda-96d7f3e7e678a8ac9919ce628c2f792d4cb57955.tar.xz anaconda-96d7f3e7e678a8ac9919ce628c2f792d4cb57955.zip |
2008-06-04 Ján ONDREJ <ondrejj@salstar.sk> (via ondrejj@fedoraproject.org)
* po/sk.po: Typo fix.
Diffstat (limited to 'installclasses')
-rw-r--r-- | installclasses/fedora.py | 10 | ||||
-rw-r--r-- | installclasses/rhel.py | 14 |
2 files changed, 8 insertions, 16 deletions
diff --git a/installclasses/fedora.py b/installclasses/fedora.py index eec67a039..f140139ba 100644 --- a/installclasses/fedora.py +++ b/installclasses/fedora.py @@ -18,11 +18,13 @@ # from installclass import BaseInstallClass -from rhpl.translate import N_,_ from constants import * import os, types import iutil +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + import installmethod import yuminstall @@ -45,8 +47,6 @@ class InstallClass(BaseInstallClass): (N_("Software Development"), ["development-libs", "development-tools", "gnome-software-development", "x-software-development"],), (N_("Web server"), ["web-server"])] - repos = { "Additional Fedora Software": (None, "http://mirrors.fedoraproject.org/mirrorlist?repo=%s&arch=%s" %(productVersion, rpmUtils.arch.getBaseArch())) } - def getPackagePaths(self, uri): if not type(uri) == types.ListType: uri = [uri,] @@ -60,10 +60,6 @@ class InstallClass(BaseInstallClass): BaseInstallClass.setDefaultPartitioning(self, anaconda.id.partitions, CLEARPART_TYPE_LINUX) - def setGroupSelection(self, anaconda): - grps = anaconda.backend.getDefaultGroups(anaconda) - map(lambda x: anaconda.backend.selectGroup(x), grps) - def setSteps(self, anaconda): BaseInstallClass.setSteps(self, anaconda); anaconda.dispatch.skipStep("partition") diff --git a/installclasses/rhel.py b/installclasses/rhel.py index 94f61ff59..d1b00eed5 100644 --- a/installclasses/rhel.py +++ b/installclasses/rhel.py @@ -18,8 +18,6 @@ # from installclass import BaseInstallClass -import rhpl -from rhpl.translate import N_ from constants import * from flags import flags import os @@ -31,6 +29,9 @@ try: except ImportError: instnum = None +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + import logging log = logging.getLogger("anaconda") @@ -88,10 +89,6 @@ class InstallClass(BaseInstallClass): anaconda.id.partitions, CLEARPART_TYPE_LINUX) - def setGroupSelection(self, anaconda): - grps = anaconda.backend.getDefaultGroups(anaconda) - map(lambda x: anaconda.backend.selectGroup(x), grps) - def setSteps(self, anaconda): dispatch = anaconda.dispatch BaseInstallClass.setSteps(self, dispatch); @@ -141,9 +138,8 @@ class InstallClass(BaseInstallClass): # virt is only supported on i386/x86_64. so, let's nuke it # from our repo list on other arches unless you boot with # 'linux debug' - if name.lower() == "virt" and ( \ - rhpl.getArch() not in ("x86_64","i386") - and not flags.debug): + if name.lower() == "virt" and \ + (not iutil.isX86() and not flags.debug): continue self.repopaths[name.lower()] = path log.info("Adding %s repo" % (name,)) |