Author: gnichols
Date: 2011-05-16 18:03:37 +0000 (Mon, 16 May 2011)
New Revision: 945
Modified:
trunk/v7/hal.py
Log:
702491 - V7 1.2.x and 1.3.x fail to add expresscard tests to plan
Modified: trunk/v7/hal.py
===================================================================
--- trunk/v7/hal.py 2011-05-16 18:02:46 UTC (rev 944)
+++ trunk/v7/hal.py 2011-05-16 18:03:37 UTC (rev 945)
@@ -97,10 +97,20 @@
try:
if device.getProperty('info.bus') != 'pci':
return None
+ except KeyError:
+ return None
+ deviceID = None
+ try:
# use linux.sysfs_path_device as the id
deviceID = device.getProperty('linux.sysfs_path_device')
except KeyError:
- return None
+ pass
+ if not deviceID:
+ try:
+ # use linux.sysfs_path as the id (RHEL 6)
+ deviceID = device.getProperty('linux.sysfs_path')
+ except KeyError:
+ return None
# check the detailed pcidom:pcibus:pcidev.pcifn
deviceInfo = deviceID[-12:]
if deviceInfo:
Show replies by date