diff options
author | Jeremy Katz <katzj@redhat.com> | 2009-06-30 16:07:13 -0400 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2009-07-01 10:21:37 -0400 |
commit | b0fe24364587eb75d99114366dafc004b1c2ab55 (patch) | |
tree | 7261b3c4884e3a6ee6ea93e0757b542c906966ad /iutil.py | |
parent | db6476fb40dd04e13c9a8973b2d00d7c1a74154d (diff) | |
download | anaconda-b0fe24364587eb75d99114366dafc004b1c2ab55.tar.gz anaconda-b0fe24364587eb75d99114366dafc004b1c2ab55.tar.xz anaconda-b0fe24364587eb75d99114366dafc004b1c2ab55.zip |
Stop using rhpl.arch in writeRpmPlatform()
yum's rpmUtils.arch has the same bits as rhpl.arch, so use those
instead for writing out /etc/rpm/platform
Diffstat (limited to 'iutil.py')
-rw-r--r-- | iutil.py | 7 |
1 files changed, 3 insertions, 4 deletions
@@ -26,7 +26,6 @@ import signal import os.path from errno import * import inspect -import rhpl import warnings import subprocess from flags import flags @@ -565,7 +564,7 @@ def isEfi(): ## Generate the /etc/rpm/macros file. # @param root The root of the filesystem to create the files in. def writeRpmPlatform(root="/"): - import rhpl.arch + import rpmUtils.arch if flags.test: return @@ -574,14 +573,14 @@ def writeRpmPlatform(root="/"): if not os.access("%s/etc/rpm" %(root,), os.X_OK): os.mkdir("%s/etc/rpm" %(root,)) - myarch = rhpl.arch.canonArch + myarch = rpmUtils.arch.canonArch # now allow an override with rpmarch=i586 on the command line (#101971) if flags.targetarch != None: myarch = flags.targetarch # now make the current install believe it, too - rhpl.arch.canonArch = myarch + rpmUtils.arch.canonArch = myarch # FIXME: writing /etc/rpm/macros feels wrong somehow # temporary workaround for #92285 |