Description: Handle openmpi versioning if a non-digit is present
Author: Alastair McKinstry <mckinstry@debian.org>
Last-Updated: 2020-02-16
Fordwarded: no

Index: python-escript-5.6/SConstruct
===================================================================
--- python-escript-5.6.orig/SConstruct
+++ python-escript-5.6/SConstruct
@@ -552,7 +552,8 @@ if env['launcher'] == 'default':
         # default to OpenMPI version 1.10 or higher
         env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} "+hostoptionstr+" --map-by node:pe=%t -bind-to core -np %N %b"
         if 'orte_version' in env:
-            major,minor,point = [int(i) for i in env['orte_version'].split('.')]
+            v = [int(s) for s in env['orte_version'].split('.') if s.isdigit()]
+            major, minor = v[0], v[1]
             if major == 1 and minor < 10:
                 env['launcher'] = "mpirun ${AGENTOVERRIDE} --gmca mpi_warn_on_fork 0 ${EE} "+hostoptionstr+" --cpus-per-rank %t -np %N %b"
     elif env['mpi'] == 'MPT':