diff options
author | Jeremy Katz <katzj@redhat.com> | 2009-07-29 17:36:07 -0400 |
---|---|---|
committer | Jeremy Katz <katzj@redhat.com> | 2009-07-29 17:36:07 -0400 |
commit | 84e4a0281a30eaeb8a0e73d15ecd36a8ab9af0e8 (patch) | |
tree | a9c5bd34b300bf5fae2c366f0331c4452d2955b5 | |
parent | cfc1e3e3a1aa864cb4e218f9b1b9c2e587c0a8df (diff) | |
download | anaconda-84e4a0281a30eaeb8a0e73d15ecd36a8ab9af0e8.tar.gz anaconda-84e4a0281a30eaeb8a0e73d15ecd36a8ab9af0e8.tar.xz anaconda-84e4a0281a30eaeb8a0e73d15ecd36a8ab9af0e8.zip |
Catch None devs
-rwxr-xr-x | isys/isys.py | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/isys/isys.py b/isys/isys.py index f4aeaeccc..78ca9d2be 100755 --- a/isys/isys.py +++ b/isys/isys.py @@ -600,7 +600,9 @@ def getNetDevDesc(dev): udev_path = device_props['Udi'] dev = udev_get_block_device(udev_path, requireName=False) - if dev.has_key("ID_VENDOR_ENC") and dev.has_key("ID_MODEL_ENC"): + if dev is None: + log.debug("weird, we have a None dev with path %s" % path) + elif dev.has_key("ID_VENDOR_ENC") and dev.has_key("ID_MODEL_ENC"): desc = "%s %s" % (dev["ID_VENDOR_ENC"], dev["ID_MODEL_ENC"]) elif dev.has_key("ID_VENDOR_FROM_DATABASE") and dev.has_key("ID_MODEL_FROM_DATABASE"): desc = "%s %s" % (dev["ID_VENDOR_FROM_DATABASE"], dev["ID_MODEL_FROM_DATABASE"]) |