From ba32b13aba7268887908506c51ce118b6e6d3742 Mon Sep 17 00:00:00 2001 From: eap Date: Fri, 9 Feb 2018 22:40:35 +0300 Subject: [PATCH] Typo-fix by Kunda http://www.salome-platform.org/forum/forum_9/16816690 --- salome_adm/unix/DEPRECATED/make_omniorb.in | 2 +- src/Container/SALOME_ContainerManager.cxx | 8 ++++---- src/Launcher/Test/test_launcher.py | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/salome_adm/unix/DEPRECATED/make_omniorb.in b/salome_adm/unix/DEPRECATED/make_omniorb.in index 7f4736ce9..9f5328684 100644 --- a/salome_adm/unix/DEPRECATED/make_omniorb.in +++ b/salome_adm/unix/DEPRECATED/make_omniorb.in @@ -37,7 +37,7 @@ %$(OMNIORB_IDL_CLN_CXX) %$(OMNIORB_IDL_CLN_H): ${top_builddir}/idl/%.idl $(OMNIORB_IDL) $(IDLCXXFLAGS) $(OMNIORB_IDLCXXFLAGS) $< -# dependncies between idl files +# dependencies between idl files depend_idl: .depidl # we use cpp to generate dependencies between idl files. diff --git a/src/Container/SALOME_ContainerManager.cxx b/src/Container/SALOME_ContainerManager.cxx index a104432c7..59693ea01 100644 --- a/src/Container/SALOME_ContainerManager.cxx +++ b/src/Container/SALOME_ContainerManager.cxx @@ -933,16 +933,16 @@ std::string SALOME_ContainerManager::BuildCommandToLaunchLocalContainer(const En void SALOME_ContainerManager::RmTmpFile(std::string& tmpFileName) { - int lenght = tmpFileName.size(); - if ( lenght > 0) + int length = tmpFileName.size(); + if ( length > 0) { #ifdef WIN32 std::string command = "del /F "; #else std::string command = "rm "; #endif - if ( lenght > 4 ) - command += tmpFileName.substr(0, lenght - 3 ); + if ( length > 4 ) + command += tmpFileName.substr(0, length - 3 ); else command += tmpFileName; command += '*'; diff --git a/src/Launcher/Test/test_launcher.py b/src/Launcher/Test/test_launcher.py index cbbf1b899..d6bc828e1 100755 --- a/src/Launcher/Test/test_launcher.py +++ b/src/Launcher/Test/test_launcher.py @@ -574,7 +574,7 @@ f.close() f.close() os.chmod(abs_script_file, 0o755) - #environement script + #environment script env_file = "myEnv.sh" env_text = """export ENV_TEST_VAR="expected" """ -- 2.39.2