summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNima Talebi <nima@autonomy.net.au>2009-05-20 22:33:04 +1000
committerNima Talebi <nima@autonomy.net.au>2009-05-20 22:33:04 +1000
commit178300c991d09062bedb30835ebf903c837e510c (patch)
tree0b459015d6cb7a7fbad68c3c43732f198909c5c6
parent78d0639b14007a0765914c37df70d8021973fc16 (diff)
downloadpython-dmidecode-178300c991d09062bedb30835ebf903c837e510c.tar.gz
python-dmidecode-178300c991d09062bedb30835ebf903c837e510c.tar.xz
python-dmidecode-178300c991d09062bedb30835ebf903c837e510c.zip
Preparing to push new fixed version to Debian
-rw-r--r--debian/changelog9
-rw-r--r--src/dmidecode.c12
2 files changed, 9 insertions, 12 deletions
diff --git a/debian/changelog b/debian/changelog
index 4cdf996..e9a044f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+python-dmidecode (2.10.6-1) unstable; urgency=low
+
+ * David Sommerseth picked up some bad behaviour while working on the libxml2
+ extension of python-dmidecode - on further investigation it was found that
+ this was due to a copy-paste-gone-wrong during the initial migration of
+ dmidecode to python-dmidecode - Fixed.
+
+ -- Nima Talebi <nima@it.net.au> Wed, 20 May 2009 22:32:24 +1000
+
python-dmidecode (2.10.5-3) unstable; urgency=low
* Converting to pysupport from pycentral.
diff --git a/src/dmidecode.c b/src/dmidecode.c
index 40cb861..bbf05cf 100644
--- a/src/dmidecode.c
+++ b/src/dmidecode.c
@@ -3201,8 +3201,6 @@ PyObject* dmi_decode(struct dmi_header *h, u16 ver) {
case 5: /* 3.3.6 Memory Controller Information */
- PyDict_SetItemString(caseData, "dmi_on_board_devices", dmi_on_board_devices(h));
-
if(h->length<0x0F) break;
_val = dmi_memory_controller_ed_method(data[0x04]);
PyDict_SetItemString(caseData, "Error Detecting Method", _val);
@@ -3253,8 +3251,6 @@ PyObject* dmi_decode(struct dmi_header *h, u16 ver) {
case 6: /* 3.3.7 Memory Module Information */
- PyDict_SetItemString(caseData, "dmi_on_board_devices", dmi_on_board_devices(h));
-
if(h->length<0x0C) break;
_val = dmi_string_py(h, data[0x04]);
PyDict_SetItemString(caseData, "Socket Designation", _val);
@@ -3287,8 +3283,6 @@ PyObject* dmi_decode(struct dmi_header *h, u16 ver) {
case 7: /* 3.3.8 Cache Information */
- PyDict_SetItemString(caseData, "dmi_on_board_devices", dmi_on_board_devices(h));
-
if(h->length<0x0F) break;
_val = dmi_string_py(h, data[0x04]);
PyDict_SetItemString(caseData, "Socket Designation", _val);
@@ -3346,8 +3340,6 @@ PyObject* dmi_decode(struct dmi_header *h, u16 ver) {
case 8: /* 3.3.9 Port Connector Information */
- PyDict_SetItemString(caseData, "dmi_on_board_devices", dmi_on_board_devices(h));
-
if(h->length<0x09) break;
_val = dmi_string_py(h, data[0x04]);
PyDict_SetItemString(caseData, "Internal Reference Designator", _val);
@@ -3373,8 +3365,6 @@ PyObject* dmi_decode(struct dmi_header *h, u16 ver) {
case 9: /* 3.3.10 System Slots */
- PyDict_SetItemString(caseData, "dmi_on_board_devices", dmi_on_board_devices(h));
-
if(h->length<0x0C) break;
_val = dmi_string_py(h, data[0x04]);
PyDict_SetItemString(caseData, "Designation", _val);
@@ -3411,8 +3401,6 @@ PyObject* dmi_decode(struct dmi_header *h, u16 ver) {
case 11: /* 3.3.12 OEM Strings */
- PyDict_SetItemString(caseData, "dmi_on_board_devices", dmi_on_board_devices(h));
-
if(h->length<0x05) break;
_val = dmi_oem_strings(h);
PyDict_SetItemString(caseData, "Strings", _val);