Corrected core reporting

PILOTVERSION

@@ -1 +1 @@
-3.9.2.39
+3.9.2.41

pilot/util/constants.py

@@ -28,7 +28,7 @@
 RELEASE = '3'   # released number should be fixed at 3 for Pilot 3
 VERSION = '9'   # version number is '1' for first release, '0' until then, increased for bigger updates
 REVISION = '2'  # revision number should be reset to '0' for every new version release, increased for small updates
-BUILD = '39'     # build number should be reset to '1' for every new development cycle
+BUILD = '41'     # build number should be reset to '1' for every new development cycle
 
 SUCCESS = 0
 FAILURE = 1

pilot/util/workernode.py

@@ -381,13 +381,13 @@ def get_cpu_cores(modelstring):
         logger.info(f'found {number_of_cores} cores ({cores_per_socket} cores per socket, {sockets} sockets)')
 
     logger.debug(f'current model string: {modelstring}')
-    if number_of_cores > 0 and '-Core' not in modelstring:
+    if number_of_cores > 0:
         if '-Core Processor' in modelstring:  # NN-Core info already in string - update it
             pattern = r'(\d+)\-Core Processor'
             _nn = re.findall(pattern, modelstring)
             if _nn:
                 modelstring = modelstring.replace(f'{_nn[0]}-Core', f'{number_of_cores}-Core')
-        if 'Core Processor' in modelstring:
+        elif 'Core Processor' in modelstring:
             modelstring = modelstring.replace('Core', '%d-Core' % number_of_cores)
         elif 'Processor' in modelstring:
             modelstring = modelstring.replace('Processor', '%d-Core Processor' % number_of_cores)