diff options
| -rw-r--r-- | contrib/python-dmidecode.spec | 5 | ||||
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | src/dmidecode.c | 3 | ||||
| -rw-r--r-- | src/version.h | 2 |
4 files changed, 12 insertions, 4 deletions
diff --git a/contrib/python-dmidecode.spec b/contrib/python-dmidecode.spec index e31dd0e..ccd93d7 100644 --- a/contrib/python-dmidecode.spec +++ b/contrib/python-dmidecode.spec @@ -3,7 +3,7 @@ Summary: Python module to access DMI data Name: python-dmidecode -Version: 3.10.12 +Version: 3.10.13 Release: 1%{?dist} License: GPLv2 Group: System Environment/Libraries @@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/python-dmidecode/ %changelog +* Thu Jun 03 2010 Nima Talebi <nima@it.net.au> - 3.10.13-1 +- Update to new release + * Fri Mar 12 2010 Nima Talebi <nima@it.net.au> - 3.10.12-1 - Update to new release diff --git a/debian/changelog b/debian/changelog index 11e3ef9..4bd61c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +python-dmidecode (3.10.13-1) unstable; urgency=low + + * New upstream release. + + -- Nima Talebi <nima@it.net.au> Thu, 03 Jun 2010 19:56:38 +1000 + python-dmidecode (3.10.12-2) unstable; urgency=low * Added a missing dependency (Closes: Bug#578891) - thanks to Sven Wick for diff --git a/src/dmidecode.c b/src/dmidecode.c index b89c163..4a2e445 100644 --- a/src/dmidecode.c +++ b/src/dmidecode.c @@ -1019,7 +1019,6 @@ xmlNode *dmi_processor_id(xmlNode *node, u8 type, const u8 * p, const char *vers ** CPUID instruction or another form of identification. */ - //. TODO: PyString_FromFormat does not support %x (yet?)... dmixml_AddTextChild(data_n, "ID", "%02x %02x %02x %02x %02x %02x %02x %02x", p[0], p[1], p[2], p[3], p[4], p[5], p[6], p[7]); @@ -1075,7 +1074,7 @@ xmlNode *dmi_processor_id(xmlNode *node, u8 type, const u8 * p, const char *vers sig = 2; - } else if(type == 0x01 || type == 0x02) { + } else if(version && (type == 0x01 || type == 0x02)) { /* ** Some X86-class CPU have family "Other" or "Unknown". In this case, ** we use the version string to determine if they are known to diff --git a/src/version.h b/src/version.h index 912de39..742a13f 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define VERSION "3.10.12" +#define VERSION "3.10.13" |