diff options
| author | Steven Knight <knight@baldmt.com> | 2003-06-12 15:28:38 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-06-12 15:28:38 (GMT) |
| commit | 823ab5a50f9856308ee9559f968d62409ad625da (patch) | |
| tree | c24bc193f5a9acbceed0bb58b44768355f3ee945 /src/engine/SCons/Script | |
| parent | 6c11c2362e17142f384a914d821d0e0cd021ecd2 (diff) | |
| download | SCons-823ab5a50f9856308ee9559f968d62409ad625da.zip SCons-823ab5a50f9856308ee9559f968d62409ad625da.tar.gz SCons-823ab5a50f9856308ee9559f968d62409ad625da.tar.bz2 | |
Raise an error if SConf needs to do something but -n or -q is specified. (Christoph Wiedemann)
Diffstat (limited to 'src/engine/SCons/Script')
| -rw-r--r-- | src/engine/SCons/Script/__init__.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py index 1c773f0..139d296 100644 --- a/src/engine/SCons/Script/__init__.py +++ b/src/engine/SCons/Script/__init__.py @@ -723,8 +723,12 @@ def _main(): if options.warn: _setup_warn(options.warn) if options.noexec: + SCons.SConf.dryrun = 1 SCons.Action.execute_actions = None CleanTask.execute = CleanTask.show + if options.question: + SCons.SConf.dryrun = 1 + if options.no_progress or options.silent: display.set_mode(0) if options.silent: @@ -977,6 +981,8 @@ def main(): _scons_syntax_error(e) except SCons.Errors.UserError, e: _scons_user_error(e) + except SCons.Errors.ConfigureDryRunError, e: + _scons_configure_dryrun_error(e) except: _scons_other_errors() |