summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorUlf Magnusson <ulfalizer@gmail.com>2015-06-06 10:22:38 +0200
committerUlf Magnusson <ulfalizer@gmail.com>2015-06-06 10:23:33 +0200
commit6a1ee6c86a3d0c4a343b2f22fa5f6328002ea047 (patch)
treedffe65a573db3ff59076d037e4c0984f03a1476c
parent1dabda899dd22ecbf58da124d764dbbcbdf6d5ea (diff)
load_config() nit.
Each expression in the loop is relatively expensive at this point too.
-rw-r--r--kconfiglib.py13
1 files changed, 4 insertions, 9 deletions
diff --git a/kconfiglib.py b/kconfiglib.py
index 9ff4bbf..0899e10 100644
--- a/kconfiglib.py
+++ b/kconfiglib.py
@@ -305,10 +305,8 @@ class Config(object):
.replace('\\"', '"').replace("\\\\", "\\")
if name in self.syms:
sym = self.syms[name]
-
- old_user_val = sym.user_val
- if old_user_val is not None:
- warn_override(filename, linenr, name, old_user_val, val)
+ if sym.user_val is not None:
+ warn_override(filename, linenr, name, sym.user_val, val)
if sym.is_choice_symbol_:
user_mode = sym.parent.user_mode
@@ -318,7 +316,6 @@ class Config(object):
.format(name, val, user_mode),
filename,
linenr)
-
sym._set_user_value_no_invalidate(val, True)
else:
@@ -334,10 +331,8 @@ class Config(object):
name = unset_match.group(1)
if name in self.syms:
sym = self.syms[name]
-
- old_user_val = sym.user_val
- if old_user_val is not None:
- warn_override(filename, linenr, name, old_user_val, "n")
+ if sym.user_val is not None:
+ warn_override(filename, linenr, name, sym.user_val, "n")
sym._set_user_value_no_invalidate("n", True)