From: Alexander Popov <alex.popov@linux.com>
Date: Fri, 11 Feb 2022 22:03:06 +0000 (+0300)
Subject: Refactor the OR logic code
X-Git-Tag: v0.5.17~31^2
X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=3d9f2f8b37d2b9a9edb2c58317977ea3db60f206;p=kconfig-hardened-check.git

Refactor the OR logic code
---

diff --git a/kconfig_hardened_check/__init__.py b/kconfig_hardened_check/__init__.py
index bc0892a..e60aac0 100644
--- 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:
-                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)
+                else:
+                    self.result = opt.result
                 return True
         self.result = self.opts[0].result
         return False