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 /upgrade.py | |
| 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 'upgrade.py')
| -rw-r--r-- | upgrade.py | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/upgrade.py b/upgrade.py index 78a50522f..d95609d03 100644 --- a/upgrade.py +++ b/upgrade.py @@ -36,7 +36,9 @@ from constants import * from product import productName import rhpl -from rhpl.translate import _ + +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) import rpm @@ -51,12 +53,12 @@ upgrade_remove_blacklist = [("system-config-mouse",), ("dev",)] # multilib package removed. the new -libs package will then get pulled in # automatically by dependencies splitpkgs = ("e2fsprogs", "hal", "mysql", "esound", "mkinitrd", "dbus", "kdeaccessibility", "kdebase", "kdeedu", "kdegraphics", "kdemultimedia", "kdemultimedia-extras","kdenetwork", "kdesdk", "kdeutils", "kdewebdev", "gdb", "kmymoney2", "gnome-applets", "geomview", "gnome-panel", "nas") -if rhpl.getArch() == "x86_64": +if iutil.isX86(bits=64): upgrade_remove_blacklist.extend(map(lambda x: (x, "i386"), splitpkgs)) -if rhpl.getArch() == "ppc": +if iutil.isPPC(): upgrade_remove_blacklist.extend(map(lambda x: (x, "ppc64"), splitpkgs)) -if rhpl.getArch() == "x86_64": +if iutil.isX86(bits=64): upgrade_remove_blacklist.extend( [("perl","i386")] ) def guessGuestArch(rootdir): @@ -439,7 +441,7 @@ def upgradeMountFilesystems(anaconda): for entry in newfsset.entries: anaconda.id.fsset.add(entry) if flags.setupFilesystems: - if rhpl.getArch() == "ppc": + if iutil.isPPC(): anaconda.id.fsset.formatSwap(anaconda.rootPath, forceFormat=True) anaconda.id.fsset.turnOnSwap(anaconda.rootPath, upgrading=True) anaconda.id.fsset.mkDevRoot(anaconda.rootPath) @@ -489,8 +491,8 @@ def setSteps(anaconda): "complete" ) - if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64": + if not iutil.isX86(): dispatch.skipStep("bootloader") - if rhpl.getArch() != "i386" and rhpl.getArch() != "x86_64": + if not iutil.isX86(): dispatch.skipStep("upgbootloader") |