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 /packages.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 'packages.py')
-rw-r--r-- | packages.py | 46 |
1 files changed, 5 insertions, 41 deletions
diff --git a/packages.py b/packages.py index 8bc767f84..e27217b34 100644 --- a/packages.py +++ b/packages.py @@ -39,13 +39,12 @@ from flags import flags from product import * from constants import * -import rhpl -from rhpl.translate import _ -import rhpl.arch - import logging log = logging.getLogger("anaconda") +import gettext +_ = lambda x: gettext.ldgettext("anaconda", x) + def doPostAction(anaconda): anaconda.id.instClass.postAction(anaconda) @@ -88,41 +87,6 @@ def copyAnacondaLogs(anaconda): except: pass -def writeXConfiguration(anaconda): - testmode = flags.test - -# comment out to test - if testmode: - return -# end code to comment to test -# uncomment to test writing X config in test mode -# try: -# os.mkdir("/tmp/etc") -# except: -# pass -# try: -# os.mkdir("/tmp/etc/X11") -# except: -# pass -# instPath = '/' -# end code for test writing - - if anaconda.id.xsetup.skipx: - return - - card = anaconda.id.videocard.primaryCard() - if not card: - return - - log.info("Writing X configuration") - if not testmode: - fn = anaconda.rootPath - else: - fn = "/tmp/" - - anaconda.id.xsetup.write(fn+"/etc/X11", anaconda.id.keyboard) - anaconda.id.desktop.write(anaconda.rootPath) - def doMigrateFilesystems(anaconda): if anaconda.dir == DISPATCH_BACK: return DISPATCH_NOOP @@ -130,7 +94,7 @@ def doMigrateFilesystems(anaconda): if anaconda.id.fsset.haveMigratedFilesystems(): return DISPATCH_NOOP - anaconda.id.fsset.migrateFilesystems (anaconda.rootPath) + anaconda.id.fsset.migrateFilesystems (anaconda) if anaconda.id.upgrade: # if we're upgrading, we may need to do lvm device node hackery @@ -228,7 +192,7 @@ def setupTimezone(anaconda): except OSError, (errno, msg): log.error("Error copying timezone (from %s): %s" %(tzfile, msg)) - if rhpl.getArch() == "s390": + if iutil.isS390(): return args = [ "--hctosys" ] if anaconda.id.timezone.utc: |