From 2003415f09f03daf67a3c285b00fd5e5f52a131b Mon Sep 17 00:00:00 2001 From: Bas Couwenberg Date: Fri, 5 Aug 2016 14:50:50 +0200 Subject: [PATCH] Fix 'occured' typo, replace with 'occurred'. --- scons/scons-local-2.5.0/SCons/Errors.py | 2 +- scons/scons-local-2.5.0/SCons/Script/Main.py | 4 ++-- src/load_map.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scons/scons-local-2.5.0/SCons/Errors.py b/scons/scons-local-2.5.0/SCons/Errors.py index 0ddd7b35c..81131b7ca 100644 --- a/scons/scons-local-2.5.0/SCons/Errors.py +++ b/scons/scons-local-2.5.0/SCons/Errors.py @@ -73,7 +73,7 @@ class BuildError(Exception): Information about the cause of the location of the error: --------------------------------------------------------- - node : the error occured while building this target node(s) + node : the error occurred while building this target node(s) executor : the executor that caused the build to fail (might be None if the build failures is not due to the diff --git a/scons/scons-local-2.5.0/SCons/Script/Main.py b/scons/scons-local-2.5.0/SCons/Script/Main.py index d7c3a5940..3c5b377ba 100644 --- a/scons/scons-local-2.5.0/SCons/Script/Main.py +++ b/scons/scons-local-2.5.0/SCons/Script/Main.py @@ -564,7 +564,7 @@ def find_deepest_user_frame(tb): def _scons_user_error(e): """Handle user errors. Print out a message and a description of the - error, along with the line number and routine where it occured. + error, along with the line number and routine where it occurred. The file and line number will be the deepest stack frame that is not part of SCons itself. """ @@ -579,7 +579,7 @@ def _scons_user_error(e): def _scons_user_warning(e): """Handle user warnings. Print out a message and a description of - the warning, along with the line number and routine where it occured. + the warning, along with the line number and routine where it occurred. The file and line number will be the deepest stack frame that is not part of SCons itself. """ diff --git a/src/load_map.cpp b/src/load_map.cpp index fcb04c003..bf6324d20 100644 --- a/src/load_map.cpp +++ b/src/load_map.cpp @@ -755,7 +755,7 @@ void map_parser::parse_layer(Map & map, xml_node const& node) } catch (...) { - throw config_error("Unknown exception occured attempting to create datasoure for layer '" + lyr.name() + "'"); + throw config_error("Unknown exception occurred attempting to create datasoure for layer '" + lyr.name() + "'"); } } }