From e22d376f1d547df064a61732ac6f763dd071d3cd Mon Sep 17 00:00:00 2001 From: Leonard Crestez Date: Mon, 18 Dec 2017 18:23:21 +0200 Subject: [PATCH] utils/env: Only add nrg_model key to platform if not None There are checks like if "nrg_model" in platform but they return True if a None value is present. So make sure that such a value is never present. Signed-off-by: Leonard Crestez --- libs/utils/env.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libs/utils/env.py b/libs/utils/env.py index 013f44f99..2cd08b862 100644 --- a/libs/utils/env.py +++ b/libs/utils/env.py @@ -795,7 +795,10 @@ class TestEnv(ShareState): self.platform['nrg_model'] = self.conf['nrg_model'] # Try to load the default energy model (if available) else: - self.platform['nrg_model'] = self._load_em(self.conf['board']) + nrg_model = self._load_em(self.conf['board']) + # We shouldn't have an 'nrg_model' key if there is no energy model data + if nrg_model: + self.platform['nrg_model'] = nrg_model # Adding topology information self.platform['topology'] = self.topology.get_level("cluster") -- GitLab