diff options
author | Brendan Jackman <brendan.jackman@arm.com> | 2017-09-21 13:30:33 +0100 |
---|---|---|
committer | Brendan Jackman <brendan.jackman@arm.com> | 2017-09-21 13:31:59 +0100 |
commit | 6bb24aa12a8ca20c2803a8c3fb3c7fc2c3bd79e7 (patch) | |
tree | 19573dc2cea8016e1e61d0afc0238848e744b821 /devlib | |
parent | 25ad53feff50ea8b81072e2601f1adc22e5ffd5e (diff) | |
download | devlib-6bb24aa12a8ca20c2803a8c3fb3c7fc2c3bd79e7.tar.gz |
hwmon: Disable if no permissions
If we don't have permissions, scan() currently raises a
TargetError. Instead we should return False from probe() so the
module is disabled
Diffstat (limited to 'devlib')
-rw-r--r-- | devlib/module/hwmon.py | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/devlib/module/hwmon.py b/devlib/module/hwmon.py index dc00442..06fa550 100644 --- a/devlib/module/hwmon.py +++ b/devlib/module/hwmon.py @@ -15,6 +15,7 @@ import re from collections import defaultdict +from devlib import TargetError from devlib.module import Module from devlib.utils.types import integer @@ -116,7 +117,15 @@ class HwmonModule(Module): @staticmethod def probe(target): - return target.file_exists(HWMON_ROOT) + if not target.file_exists(HWMON_ROOT): + return False + try: + target.list_directory(HWMON_ROOT, as_root=target.is_rooted) + except TargetError: + # Probably no permissions + return False + + return True @property def sensors(self): |