summaryrefslogtreecommitdiff
path: root/bin
diff options
authorJeff Lane <jeffrey.lane@canonical.com>2016-02-08 22:18:12 -0500
committerJeff Lane <jeffrey.lane@canonical.com>2016-02-08 22:18:12 -0500
commit34b5651413a6383a1cc7f936497c3c2914b0ce7b (patch)
treee47ec32d4ae24955ae72068da4625d5d3fc2a84a /bin
parent9aa1350eafe9acb627352b437e0ddd0d5bd33131 (diff)
Fixed a bad if statement (should have been elif) and removed an instumentation line I missed before
Diffstat (limited to 'bin')
-rwxr-xr-xbin/cpu_topology3
1 files changed, 1 insertions, 2 deletions
diff --git a/bin/cpu_topology b/bin/cpu_topology
index 356b87c..78317b7 100755
--- a/bin/cpu_topology
+++ b/bin/cpu_topology
@@ -30,7 +30,7 @@ class proc_cpuinfo():
key = 'cpu' + cpu_num
self.cpuinfo[key] = {'core_id': cpu_num,
'physical_package_id': cpu_num}
- if r_x86.match(i):
+ elif r_x86.match(i):
key = 'cpu' + (i.split(':')[1].strip())
self.cpuinfo[key] = {'core_id': '', 'physical_package_id': ''}
elif i.startswith('core id'):
@@ -109,7 +109,6 @@ def main():
sys_cpu[key]['core_id'].center(9)), file=sys.stderr)
return 1
else:
- instrument("What do you know? It works")
return 0
if __name__ == '__main__':