From 283a1d3b52f3755733aa592eac99fab54feadd5b Mon Sep 17 00:00:00 2001 From: William Deegan Date: Sun, 16 Feb 2020 14:25:12 -0800 Subject: Updated error message per sugguestion by mwichmann --- src/engine/SCons/SConf.py | 2 +- test/Configure/issue-2906-useful-duplicate-configure-message.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/engine/SCons/SConf.py b/src/engine/SCons/SConf.py index a5e443e..685fa3e 100644 --- a/src/engine/SCons/SConf.py +++ b/src/engine/SCons/SConf.py @@ -430,7 +430,7 @@ class SConfBase(object): SConfFS = SCons.Node.FS.default_fs or \ SCons.Node.FS.FS(env.fs.pathTop) if sconf_global is not None: - raise SCons.Errors.UserError("""User Called Configure() when another Configure() exists. + raise SCons.Errors.UserError("""Configure() called while another Configure() exists. Please call .Finish() before creating and second Configure() context""") if log_file is not None: diff --git a/test/Configure/issue-2906-useful-duplicate-configure-message.py b/test/Configure/issue-2906-useful-duplicate-configure-message.py index 716cb33..c980bd3 100644 --- a/test/Configure/issue-2906-useful-duplicate-configure-message.py +++ b/test/Configure/issue-2906-useful-duplicate-configure-message.py @@ -43,7 +43,7 @@ test_SConstruct_path = test.workpath('SConstruct') expected_stdout = "scons: Reading SConscript files ...\n" expected_stderr = """ -scons: *** User Called Configure() when another Configure() exists. +scons: *** Configure() called while another Configure() exists. Please call .Finish() before creating and second Configure() context File "%s", line 5, in \n"""%test_SConstruct_path test.run(stderr=expected_stderr, stdout=expected_stdout, status=2) -- cgit v0.12