Merge lp:~brendan-donegan/checkbox/bug882161_cpu_topology into lp:checkbox

[Brendan Donegan]

There's a small problem in the cpu_topology script in that it thinks that if the word 'processor' is in the value of a field then that field is the 'processor' field. This branch fixes that.

This change needs to be backported to Oneiric as well.

[Daniel Manrique (roadmr)]

Thanks! Approving and merging.

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-24 17:17:07 +0000
+++ debian/changelog	2011-11-25 13:03:25 +0000
@@ -1,6 +1,9 @@
 checkbox (0.13.1) precise; urgency=low
 
-  * Incremented version 
+  [Brendan Donegan]
+  * Fixed the cpu_topology script so that it doesn't mistake the word
+    'processor' in the value of another field for the field 'processor'
+    (LP: #882161)
 
  -- Daniel Manrique <[e-mail]>  Thu, 24 Nov 2011 12:16:36 -0500
 

=== modified file 'scripts/cpu_topology'
--- scripts/cpu_topology	2011-06-22 10:19:39 +0000
+++ scripts/cpu_topology	2011-11-25 13:03:25 +0000
@@ -21,12 +21,12 @@
             cpu_fh.close()
 
         for i in temp:
-            if 'processor' in i:
+            if i.startswith('processor'):
                 key = 'cpu'+(i.split(':')[1].strip())
                 self.cpuinfo[key] = {}
-            elif 'core id' in i:
+            elif i.startswith('core id'):
                 self.cpuinfo[key].update({'core_id':i.split(':')[1].strip()})
-            elif 'physical id' in i:
+            elif i.startswith('physical id'):
                 self.cpuinfo[key].update({'physical_package_id':i.split(':')[1].strip()})
             else:
                 continue