diff options
| author | Peter Jones <pjones@redhat.com> | 2006-11-08 19:16:51 +0000 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2006-11-08 19:16:51 +0000 |
| commit | 9fcd2cb682c842a821356fd6b3aef1c7935d4c43 (patch) | |
| tree | 7dbba11471f7679b1c05314808ca502cbd925df6 /isys | |
| parent | 60bd5a955c3461fe8540ff7f66e425c931ba779e (diff) | |
| download | anaconda-9fcd2cb682c842a821356fd6b3aef1c7935d4c43.tar.gz anaconda-9fcd2cb682c842a821356fd6b3aef1c7935d4c43.tar.xz anaconda-9fcd2cb682c842a821356fd6b3aef1c7935d4c43.zip | |
- don't segfault when importing isys on ppc (#214653)
Diffstat (limited to 'isys')
| -rw-r--r-- | isys/isys.c | 6 | ||||
| -rw-r--r-- | isys/isys.py | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/isys/isys.c b/isys/isys.c index 741cfbb8c..4e6894c69 100644 --- a/isys/isys.c +++ b/isys/isys.c @@ -1315,9 +1315,11 @@ static PyObject * doGetBiosDisk(PyObject * s, PyObject * args) { if (!PyArg_ParseTuple(args, "s", &mbr_sig)) return NULL; - diskname = getBiosDisk(mbr_sig); - return Py_BuildValue("s", diskname); + if ((diskname = getBiosDisk(mbr_sig))) + return Py_BuildValue("s", diskname); + Py_INCREF(Py_None); + return Py_None; } static PyObject * doSegvHandler(PyObject *s, PyObject *args) { diff --git a/isys/isys.py b/isys/isys.py index 7fa0ec4f7..d50b0b2c2 100644 --- a/isys/isys.py +++ b/isys/isys.py @@ -440,6 +440,8 @@ def getopt(*args): return apply(_isys.getopt, args) def doProbeBiosDisks(): + if rhpl.getArch() != "i386": + return None return _isys.biosDiskProbe() def doGetBiosDisk(mbrSig): |