diff options
| author | Jeremy Katz <katzj@redhat.com> | 2002-01-09 00:53:27 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2002-01-09 00:53:27 +0000 |
| commit | 09bb99f8845738fe2a23a45d2505493d61480b5a (patch) | |
| tree | f85ebd1beaed4dbd28766b85c05871bb53cac518 /packages.py | |
| parent | 46fd98e4e68277e5f11a82e57e94c728d1d1c9b7 (diff) | |
| download | anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.tar.gz anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.tar.xz anaconda-09bb99f8845738fe2a23a45d2505493d61480b5a.zip | |
iutil.getArch now returns s390 for s390x, clean up to handle this nicely
Diffstat (limited to 'packages.py')
| -rw-r--r-- | packages.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/packages.py b/packages.py index f6a788aa5..a5d86328b 100644 --- a/packages.py +++ b/packages.py @@ -365,7 +365,7 @@ def doPreInstall(method, id, intf, instPath, dir): if not upgrade: # this is NICE and LATE. It lets kickstart/server/workstation # installs detect this properly - if arch == "s390" or arch == "s390x": + if arch == "s390": if (string.find(os.uname()[2], "tape") > -1): select(id.hdList, 'kernel-tape') else: @@ -405,7 +405,7 @@ def doPreInstall(method, id, intf, instPath, dir): if pcmcia.pcicType(): select(id.hdList, 'kernel-pcmcia-cs') - if iutil.getArch() != "s390" and iutil.getArch() != "s390x": + if iutil.getArch() != "s390": xserver = id.videocard.primaryCard().getXServer() if (xserver and id.comps.packages.has_key('XFree86') and id.comps.packages['XFree86'].selected @@ -712,7 +712,7 @@ def doPostInstall(method, id, intf, instPath): # XXX currently Bad Things (X async reply) happen when doing # Mouse Magic on Sparc (Mach64, specificly) # The s390 doesn't even have a mouse! - if os.environ.has_key ("DISPLAY") and not (arch == "sparc" or arch == "s390" or arch == "s390x"): + if os.environ.has_key ("DISPLAY") and not (arch == "sparc" or arch == "s390"): import xmouse try: mousedev = xmouse.get()[0] @@ -729,7 +729,7 @@ def doPostInstall(method, id, intf, instPath): except RuntimeError: pass - if arch != "s390" and arch != "s390x": + if arch != "s390": unmountUSB = 0 try: isys.mount('/usbdevfs', instPath+'/proc/bus/usb', 'usbdevfs') |