diff options
| author | Steven Knight <knight@baldmt.com> | 2007-07-11 19:58:03 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2007-07-11 19:58:03 (GMT) |
| commit | 5b5bd8fc679c9ea85cd173f2c18ff88b656ee009 (patch) | |
| tree | 3acb9712ca8521ff76cbb8fd2e940e856a9a53d5 /src/engine/SCons/Script/SConscript.py | |
| parent | a3ab2dfc1196f755e222a0a4fea622bf29099897 (diff) | |
| download | SCons-5b5bd8fc679c9ea85cd173f2c18ff88b656ee009.zip SCons-5b5bd8fc679c9ea85cd173f2c18ff88b656ee009.tar.gz SCons-5b5bd8fc679c9ea85cd173f2c18ff88b656ee009.tar.bz2 | |
Merged revisions 2117-2120 via svnmerge from
http://scons.tigris.org/svn/scons/branches/core
........
r2119 | garyo | 2007-07-11 08:53:36 -0500 (Wed, 11 Jul 2007) | 1 line
Fixed minor cut/paste doc error
........
r2120 | stevenknight | 2007-07-11 12:42:50 -0500 (Wed, 11 Jul 2007) | 4 lines
Simplify the {Add,Get,Set}Option() implementations, and initialize the
OptionsParser variable with a do-nothing class, in case it's used
by test scripts without normal SCons.Script.Main initialization.
........
Diffstat (limited to 'src/engine/SCons/Script/SConscript.py')
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 7326c0c..a1856da 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -469,7 +469,7 @@ class SConsEnvironment(SCons.Environment.Base): def GetOption(self, name): name = self.subst(name) - return getattr(SCons.Script.Main.OptionsParser.values, name) + return SCons.Script.Main.GetOption(name) def Help(self, text): text = self.subst(text, raw=1) @@ -525,7 +525,7 @@ class SConsEnvironment(SCons.Environment.Base): def SetOption(self, name, value): name = self.subst(name) - SCons.Script.Main.OptionsParser.values.set_option(name, value) + SCons.Script.Main.SetOption(name, value) # # |