rely on a shebang in conf_files.py to choose between python2 or python3
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 29 Dec 2018 14:01:08 +0000 (15:01 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sat, 29 Dec 2018 14:01:08 +0000 (15:01 +0100)
source/steps/ChainBootNode.py

index 995d4ea..9c1e06c 100644 (file)
@@ -114,7 +114,10 @@ def Run(vars, log):
 
     if (vars['ONE_PARTITION'] != '1'):
         try:
 
     if (vars['ONE_PARTITION'] != '1'):
         try:
-            cmd = "/usr/bin/env python /usr/share/NodeManager/conf_files.py --noscripts"
+            # used to call /usr/bin/env python here, but as nodemanager
+            # now exists both in python2 and python3, we use a shebang
+            # in conf_files instead
+            cmd = "/usr/share/NodeManager/conf_files.py --noscripts"
             utils.sysexec_chroot(SYSIMG_PATH, cmd, log)
         except IOError as e:
             log.write("conf_files failed with \n {}".format(e))
             utils.sysexec_chroot(SYSIMG_PATH, cmd, log)
         except IOError as e:
             log.write("conf_files failed with \n {}".format(e))