summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>2005-12-20 06:16:21 +0000
committerBill Nottingham <notting@redhat.com>2005-12-20 06:16:21 +0000
commit7d7b4c02c72c41ec99c98dcb83b25c220bc7082a (patch)
tree92fd923b08a91e1a2d96c2a77f05059b9cc2c932
parentc2f6a16b0e9072624db484180b3b14f4c5f74334 (diff)
downloadanaconda-7d7b4c02c72c41ec99c98dcb83b25c220bc7082a.tar.gz
anaconda-7d7b4c02c72c41ec99c98dcb83b25c220bc7082a.tar.xz
anaconda-7d7b4c02c72c41ec99c98dcb83b25c220bc7082a.zip
2005-12-20 Bill Nottingham <notting@redhat.com>
* iutil.py (getPPCMachine): Be silent on non-ppc arches.
-rw-r--r--ChangeLog4
-rw-r--r--iutil.py4
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 74b981f5f..709ecdf0f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-12-20 Bill Nottingham <notting@redhat.com>
+
+ * iutil.py (getPPCMachine): Be silent on non-ppc arches.
+
2005-12-19 Jeremy Katz <katzj@redhat.com>
* anaconda.spec: Bump version.
diff --git a/iutil.py b/iutil.py
index e7f9ca74c..918740b00 100644
--- a/iutil.py
+++ b/iutil.py
@@ -527,6 +527,10 @@ def hasiSeriesNativeStorage():
# return the ppc machine variety type
def getPPCMachine():
+
+ if getArch() != "ppc":
+ return 0
+
machine = rhpl.getPPCMachine()
if machine is None:
log.warning("Unable to find PowerPC machine type")