Commit 3d9f2f8b by Alexander Popov

Refactor the OR logic code

parent 922ac4d7
...@@ -220,14 +220,11 @@ class OR(ComplexOptCheck): ...@@ -220,14 +220,11 @@ class OR(ComplexOptCheck):
for i, opt in enumerate(self.opts): for i, opt in enumerate(self.opts):
ret = opt.check() ret = opt.check()
if ret: if ret:
if opt.result != 'OK' or i == 0: if opt.result == 'OK' and i != 0:
# Preserve additional explanation of this OK result. # Simple OK is not enough for additional checks, add more info:
# 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.
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 return True
self.result = self.opts[0].result self.result = self.opts[0].result
return False return False
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment