diff options
| author | Ulf Magnusson <ulfalizer@gmail.com> | 2018-10-06 05:13:08 +0200 |
|---|---|---|
| committer | Ulf Magnusson <ulfalizer@gmail.com> | 2018-10-06 05:13:08 +0200 |
| commit | d83b9fd2061cbc59d6d112078104891493b9c0f0 (patch) | |
| tree | 6a96a14c0a8c2694e828fad2d16916ee3abc049c | |
| parent | 5d15df94df761e17d499c4430bd6dbe889490b97 (diff) | |
Use a common variable name for deps in tri_value
Might clarify the scopes a bit.
| -rw-r--r-- | kconfiglib.py | 20 |
1 files 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 |