Merge pull request #375 from fredroy/fix_warn_plugins

bakpaul · web-flow · commit 41e30d44955c · 2024-03-26T17:44:13.000+01:00
[Environment] Fix test for plugins envvars
diff --git a/Plugin/src/SofaPython3/PythonEnvironment.cpp b/Plugin/src/SofaPython3/PythonEnvironment.cpp
@@ -238,7 +238,7 @@ void PythonEnvironment::Init()
     char* pathVar = getenv(envVarName.c_str());
     
     // case where only the deprecated env var is set
-    if (pathVar != nullptr && deprecatedPathVar == nullptr)
+    if (pathVar == nullptr && deprecatedPathVar != nullptr)
     {
         msg_deprecated("SofaPython3") << deprecatedEnvVarName << " environment variable is deprecated, use " << envVarName << " instead.";
         usedEnvVarName = "SOFAPYTHON_PLUGINS_PATH";

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ void PythonEnvironment::Init()`
`238`	`238`	`char* pathVar = getenv(envVarName.c_str());`
`239`	`239`
`240`	`240`	`// case where only the deprecated env var is set`
`241`		`- if (pathVar != nullptr && deprecatedPathVar == nullptr)`
	`241`	`+ if (pathVar == nullptr && deprecatedPathVar != nullptr)`
`242`	`242`	`{`
`243`	`243`	`msg_deprecated("SofaPython3") << deprecatedEnvVarName << " environment variable is deprecated, use " << envVarName << " instead.";`
`244`	`244`	`usedEnvVarName = "SOFAPYTHON_PLUGINS_PATH";`