From d83b9fd2061cbc59d6d112078104891493b9c0f0 Mon Sep 17 00:00:00 2001 From: Ulf Magnusson Date: Sat, 6 Oct 2018 05:13:08 +0200 Subject: Use a common variable name for deps in tri_value Might clarify the scopes a bit. --- kconfiglib.py | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/kconfiglib.py b/kconfiglib.py index 5d73b7f..1239292 100644 --- a/kconfiglib.py +++ b/kconfiglib.py @@ -3769,27 +3769,27 @@ class Symbol(object): # (implies) for default, cond in self.defaults: - cond_val = expr_value(cond) - if cond_val: - val = min(expr_value(default), cond_val) + dep_val = expr_value(cond) + if dep_val: + val = min(expr_value(default), dep_val) if val: self._write_to_conf = True break # Weak reverse dependencies are only considered if our # direct dependencies are met - weak_rev_dep_val = expr_value(self.weak_rev_dep) - if weak_rev_dep_val and expr_value(self.direct_dep): - val = max(weak_rev_dep_val, val) + dep_val = expr_value(self.weak_rev_dep) + if dep_val and expr_value(self.direct_dep): + val = max(dep_val, val) self._write_to_conf = True # Reverse (select-related) dependencies take precedence - rev_dep_val = expr_value(self.rev_dep) - if rev_dep_val: - if expr_value(self.direct_dep) < rev_dep_val: + dep_val = expr_value(self.rev_dep) + if dep_val: + if expr_value(self.direct_dep) < dep_val: self._warn_select_unsatisfied_deps() - val = max(rev_dep_val, val) + val = max(dep_val, val) self._write_to_conf = True # m is promoted to y for (1) bool symbols and (2) symbols with a -- cgit v1.2.3