diff options
| author | Steven Knight <knight@baldmt.com> | 2005-08-13 22:02:54 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2005-08-13 22:02:54 (GMT) |
| commit | a941b68612df943f6addacc59cd1ff3aa47b5907 (patch) | |
| tree | 8434de90c425cfd8577a605d76cd0d413b2d3426 /src/engine/SCons/Options/__init__.py | |
| parent | 3c4eea886bf6ed264df3e7a521e196eaf6478378 (diff) | |
| download | SCons-a941b68612df943f6addacc59cd1ff3aa47b5907.zip SCons-a941b68612df943f6addacc59cd1ff3aa47b5907.tar.gz SCons-a941b68612df943f6addacc59cd1ff3aa47b5907.tar.bz2 | |
Fix conversion and comparison of Boolean values. (Craig Scott)
Diffstat (limited to 'src/engine/SCons/Options/__init__.py')
| -rw-r--r-- | src/engine/SCons/Options/__init__.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/SCons/Options/__init__.py b/src/engine/SCons/Options/__init__.py index f5f1b8d..7333985 100644 --- a/src/engine/SCons/Options/__init__.py +++ b/src/engine/SCons/Options/__init__.py @@ -197,8 +197,12 @@ class Options: # Convert stuff that has a repr() that # cannot be evaluated into a string value = SCons.Util.to_String(value) - if env.subst('${%s}' % option.key) != \ - env.subst(SCons.Util.to_String(option.default)): + + defaultVal = env.subst(SCons.Util.to_String(option.default)) + if option.converter: + defaultVal = option.converter(defaultVal) + + if str(env.subst('${%s}' % option.key)) != str(defaultVal): fh.write('%s = %s\n' % (option.key, repr(value))) except KeyError: pass |