Author: gnichols
Date: 2011-05-23 14:54:18 +0000 (Mon, 23 May 2011)
New Revision: 951
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-23 14:54:02 UTC (rev 950)
+++ trunk/v7/hal.py 2011-05-23 14:54:18 UTC (rev 951)
@@ -95,7 +95,8 @@
def getPCIBusAndID(self, device):
"""rely on HAL to check PCI info"""
try:
- if device.getProperty('info.bus') != 'pci':
+ # check that this is a pci device (info.bus on RHEL5, info.subsystem on RHEL6)
+ if device.getProperty('info.bus') != 'pci' and device.getProperty('info.subsystem') != 'pci':
return None
except KeyError:
return None