r952 - in tags: . v7-V1-3R46/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-23 14:55:23 +0000 (Mon, 23 May 2011)
New Revision: 952
Added:
tags/v7-V1-3R46/
tags/v7-V1-3R46/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R46/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R46/v7/version.py (rev 0)
+++ tags/v7-V1-3R46/v7/version.py 2011-05-23 14:55:23 UTC (rev 952)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '46'
+rhel_version = '6'
12 years, 11 months
r951 - trunk/v7
by gnichols＠fedoraproject.org
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
12 years, 11 months
r950 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-23 14:54:02 +0000 (Mon, 23 May 2011)
New Revision: 950
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-05-23 14:52:56 UTC (rev 949)
+++ trunk/v7.spec.in 2011-05-23 14:54:02 UTC (rev 950)
@@ -71,7 +71,7 @@
%changelog
* Mon May 16 2011 Greg Nichols <gnichols(a)redhat.com>
-V7 1.3 R45
+V7 1.3 R46
702491 - V7 1.2.x and 1.3.x fail to add expresscard tests to plan
12 years, 11 months
r949 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-23 14:52:56 +0000 (Mon, 23 May 2011)
New Revision: 949
Modified:
trunk/Makefile
Log:
R46
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-05-16 18:06:13 UTC (rev 948)
+++ trunk/Makefile 2011-05-23 14:52:56 UTC (rev 949)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 45
+V7_RELEASE := 46
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 11 months
r948 - in tags: . v7-V1-3R45/v7
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-16 18:06:13 +0000 (Mon, 16 May 2011)
New Revision: 948
Added:
tags/v7-V1-3R45/
tags/v7-V1-3R45/v7/version.py
Log:
tag version
Copied: tags/v7-V1-3R45/v7/version.py (from rev 335, trunk/v7/version.py)
===================================================================
--- tags/v7-V1-3R45/v7/version.py (rev 0)
+++ tags/v7-V1-3R45/v7/version.py 2011-05-16 18:06:13 UTC (rev 948)
@@ -0,0 +1,5 @@
+
+# v7/version.py is automatically-generated - DO NOT EDIT
+version = '1.3'
+release = '45'
+rhel_version = '6'
12 years, 11 months
r947 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-16 18:05:21 +0000 (Mon, 16 May 2011)
New Revision: 947
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-05-16 18:04:07 UTC (rev 946)
+++ trunk/v7.spec.in 2011-05-16 18:05:21 UTC (rev 947)
@@ -69,6 +69,12 @@
%changelog
+* Mon May 16 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R45
+
+702491 - V7 1.2.x and 1.3.x fail to add expresscard tests to plan
+
* Fri May 13 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R44
12 years, 11 months
r946 - trunk/tests/expresscard
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-16 18:04:07 +0000 (Mon, 16 May 2011)
New Revision: 946
Modified:
trunk/tests/expresscard/expresscard.py
Log:
702491 - V7 1.2.x and 1.3.x fail to add expresscard tests to plan
Modified: trunk/tests/expresscard/expresscard.py
===================================================================
--- trunk/tests/expresscard/expresscard.py 2011-05-16 18:03:37 UTC (rev 945)
+++ trunk/tests/expresscard/expresscard.py 2011-05-16 18:04:07 UTC (rev 946)
@@ -55,7 +55,7 @@
hasUSB = True
if 'battery' in device.getProperty("info.category"):
hasBattery = True
- if device.getProperty("info.linux.driver") == "pcieport-driver":
+ if device.getProperty("info.linux.driver") in ["pcieport-driver", "pcieport"]:
hasPCIE = True
if hasUSB and hasBattery and hasPCIE and not isXenGuest:
test = self.makeCopy()
12 years, 11 months
r945 - trunk/v7
by gnichols＠fedoraproject.org
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:
12 years, 11 months
r944 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-16 18:02:46 +0000 (Mon, 16 May 2011)
New Revision: 944
Modified:
trunk/Makefile
Log:
R45
Modified: trunk/Makefile
===================================================================
--- trunk/Makefile 2011-05-13 19:40:55 UTC (rev 943)
+++ trunk/Makefile 2011-05-16 18:02:46 UTC (rev 944)
@@ -14,7 +14,7 @@
# Author: Greg Nichols
V7_VERSION := 1.3
-V7_RELEASE := 44
+V7_RELEASE := 45
V7_VERSION_RELEASE := $(V7_VERSION)-$(V7_RELEASE)
V7_VERSION_PY := v7/version.py
V7_SVN_MODULE := svn+ssh://svn.fedorahosted.org/svn/v7
12 years, 11 months
r943 - trunk
by gnichols＠fedoraproject.org
Author: gnichols
Date: 2011-05-13 19:40:55 +0000 (Fri, 13 May 2011)
New Revision: 943
Modified:
trunk/v7.spec.in
Log:
changelog
Modified: trunk/v7.spec.in
===================================================================
--- trunk/v7.spec.in 2011-05-13 19:39:16 UTC (rev 942)
+++ trunk/v7.spec.in 2011-05-13 19:40:55 UTC (rev 943)
@@ -69,6 +69,12 @@
%changelog
+* Fri May 13 2011 Greg Nichols <gnichols(a)redhat.com>
+
+V7 1.3 R44
+
+ 704404 - v7 1.3.43 result missing v7 version information
+
* Tue May 03 2011 Greg Nichols <gnichols(a)redhat.com>
V7 1.3 R43
12 years, 11 months
