diff options
author | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2003-08-14 02:00:12 +0000 |
commit | c540e134193f9759873ced09b0156c6219983101 (patch) | |
tree | b36013fe219e6c3d8762bf2a0a32b538ac5c0373 /image.py | |
parent | 3f01dfc8e9d6b8bf25b79b1cbda94ca0ff4ada09 (diff) | |
download | anaconda-c540e134193f9759873ced09b0156c6219983101.tar.gz anaconda-c540e134193f9759873ced09b0156c6219983101.tar.xz anaconda-c540e134193f9759873ced09b0156c6219983101.zip |
merge from taroon-branch. all kinds of miscellaneous bugfixes, including
* firewall update
* iSeries PReP size
* ppc mediacheck
* tzdata stuff
* cmdline mode
* pkg defaults screen
Diffstat (limited to 'image.py')
-rw-r--r-- | image.py | 13 |
1 files changed, 10 insertions, 3 deletions
@@ -27,6 +27,13 @@ from constants import * from rhpl.log import log from rhpl.translate import _ +# this sucks, but we want to consider s390x as s390x in here but generally +# don't. *sigh* +if os.uname()[4] == "s390x": + _arch = "s390x" +else: + _arch = iutil.getArch() + class ImageInstallMethod(InstallMethod): def readCompsViaMethod(self, hdlist): @@ -198,7 +205,7 @@ class CdromInstallMethod(ImageInstallMethod): discNum = [ 0 ] f.close() if (newStamp == timestamp and - arch == iutil.getArch() and + arch == _arch and needed in discNum): done = 1 self.currentDisc = discNum @@ -243,7 +250,7 @@ class CdromInstallMethod(ImageInstallMethod): discNum = [ 0 ] f.close() if (newStamp == timestamp and - arch == iutil.getArch() and + arch == _arch and needed in discNum): done = 1 self.currentDisc = discNum @@ -353,7 +360,7 @@ def getDiscNums(line): def findIsoImages(path, messageWindow): files = os.listdir(path) - arch = iutil.getArch() + arch = _arch discImages = {} for file in files: |