Merge pull request #43 from vincentcasseau/main

KCore: notify - minor

Cassiopee/CPlot/apps/validCassiopee.py

@@ -1558,7 +1558,8 @@ def notifyValidOK():
                messageSubject='[Cassiopee] Ready to commit',
                messageText=messageText)
     except ImportError:
-        raise SystemError("Error: KCore is required to import notify.")
+        print("Error: KCore is required to import notify.")
+        sys.exit()
 
 #==============================================================================
 def Quit(event=None):

Cassiopee/Envs/env_Cassiopee_local

@@ -94,6 +94,7 @@ else if ($MAC == "ld") then
 #------------------------------- ld rocky 8 + python 3 -----------------------------------
         setenv ELSAPROD ld
         setenv ELSAPROD "$ELSAPROD$INTTYPE"
+        . /etc/profile.d/modules-onera.sh
         module purge
         module load occt/7.6.1-gnu831
         module load python/3.8.14-gnu831

Cassiopee/Envs/sh_Cassiopee_local

@@ -79,6 +79,7 @@ elif [ "$MAC" = "ld" ]; then
 #------------------------------- ld centos 8 + python 3 -----------------------------------
     export ELSAPROD=ld
     export ELSAPROD=$ELSAPROD$INTTYPE
+    . /etc/profile.d/modules-onera.sh
     module purge
     module load occt/7.6.1-gnu831
     module load python/3.8.14-gnu831
@@ -726,17 +727,17 @@ if ! [ -z $OLD_PATHL ]; then
 fi
 
 # Prefix with new paths
-if [ -n $PATH ]; then
+if [ -n "$PATH" ]; then
     export PATH=$PATHL:$PATH
 else
     export PATH=$PATHL
 fi
-if [ -n $LD_LIBRARY_PATH ]; then
+if [ -n "$LD_LIBRARY_PATH" ]; then
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATHL:$LD_LIBRARY_PATH
 else
     export LD_LIBRARY_PATH=$LD_LIBRARY_PATHL
 fi
-if [ -n $PYTHONPATH ]; then
+if [ -n "$PYTHONPATH" ]; then
     export PYTHONPATH=$PYTHONPATHL:$PYTHONPATH
 else
     export PYTHONPATH=$PYTHONPATHL

Cassiopee/KCore/test/notifyInstall.py

@@ -2,6 +2,7 @@
 # status of different prods. Please set the environment variable CASSIOPEE_EMAIL
 # Usage: python notifyInstall.py --recipients='[email protected] [email protected]'
 import os
+import sys
 from time import strptime, strftime
 
 # Parse command-line arguments
@@ -19,7 +20,7 @@ def parseArgs():
   script_args = parseArgs()
   recipients = script_args.recipients.split(' ')
   if not recipients[0]:
-    recipients = ['[email protected]'] #, '[email protected]']
+    recipients = ['[email protected]', '[email protected]']
 
   # Check install status
   log_entries = []
@@ -44,4 +45,5 @@ def parseArgs():
            messageSubject="[Installation] State: {}".format(baseState),
            messageText=messageText)
   except ImportError:
-    raise SystemError("Error: KCore is required to import notify.")
+    print("Error: KCore is required to import notify.")
+    sys.exit()