projects
/
kconfig-hardened-check.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
922ac4d
)
Refactor the OR logic code
author
Alexander Popov
<alex.popov@linux.com>
Fri, 11 Feb 2022 22:03:06 +0000
(
01:03
+0300)
committer
Alexander Popov
<alex.popov@linux.com>
Fri, 11 Feb 2022 22:03:06 +0000
(
01:03
+0300)
kconfig_hardened_check/__init__.py
patch
|
blob
|
history
diff --git
a/kconfig_hardened_check/__init__.py
b/kconfig_hardened_check/__init__.py
index bc0892aee602d17404b300db4a00bfdca96f8179..e60aac0b4c9c3f584307611933b81226d1f13197 100644
(file)
--- a/
kconfig_hardened_check/__init__.py
+++ b/
kconfig_hardened_check/__init__.py
@@
-220,14
+220,11
@@
class OR(ComplexOptCheck):
for i, opt in enumerate(self.opts):
ret = opt.check()
if ret:
for i, opt in enumerate(self.opts):
ret = opt.check()
if ret:
- if opt.result != 'OK' or i == 0:
- # Preserve additional explanation of this OK result.
- # Simple OK is enough only for the main option that
- # this OR-check is about.
- self.result = opt.result
- else:
- # Simple OK is not enough for additional checks.
+ if opt.result == 'OK' and i != 0:
+ # Simple OK is not enough for additional checks, add more info:
self.result = 'OK: CONFIG_{} "{}"'.format(opt.name, opt.expected)
self.result = 'OK: CONFIG_{} "{}"'.format(opt.name, opt.expected)
+ else:
+ self.result = opt.result
return True
self.result = self.opts[0].result
return False
return True
self.result = self.opts[0].result
return False