Merge lp:~bladernr/checkbox/1470972-cpu_topology_traceback-sysfs into lp:checkbox

[Jeff Lane ]

Fixes a slightly incorrect use of try/except in sysfs_cpu to catch FileNotFoundErrors that occur when sysfs does not exist (ARM64).

[Zygmunt Krynicki (zyga)]

FileNotFoundError won't work on python3.2, please rewite that to catch OSError

review: Needs Fixing

[lp:~bladernr/checkbox/1470972-cpu_topology_traceback-sysfs]

3905. By Jeff Lane  on 2015-07-17

changed try block in sysfs_cpu to catch OSError instead to support Python 3.2

[Jeff Lane  (bladernr)]

OH... ok.. heh, I was thinking "What? It works fine here" but I'm running 3.4. I've amended it to catch OSError instead. Thanks for pointing that out.

review: Needs Resubmitting

[Zygmunt Krynicki (zyga)]

Thanks, +1

review: Approve

=== modified file 'providers/plainbox-provider-checkbox/bin/cpu_topology'
--- providers/plainbox-provider-checkbox/bin/cpu_topology	2014-03-20 14:01:58 +0000
+++ providers/plainbox-provider-checkbox/bin/cpu_topology	2015-07-17 18:10:31 +0000
@@ -44,10 +44,13 @@
         self.path = '/sys/devices/system/cpu/' + proc + '/topology'
         items = ['core_id', 'physical_package_id']
         for i in items:
-            syscpu_fh = open(os.path.join(self.path, i), 'r')
             try:
+                syscpu_fh = open(os.path.join(self.path, i), 'r')
+            except OSError as e:
+                print("ERROR: %s" % e)
+                sys.exit(1)
+            else:
                 self.syscpu[i] = syscpu_fh.readline().strip()
-            finally:
                 syscpu_fh.close()