From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Mon, 8 Jul 2013 19:37:37 +0000 (+0200)
Subject: more robust get_node_virt
X-Git-Tag: nodemanager-5.2-6~7
X-Git-Url: http://git.onelab.eu/?p=nodemanager.git;a=commitdiff_plain;h=b53ba3b3df3023322dc02d2a4e36298a8a3a2890

more robust get_node_virt
---

diff --git a/tools.py b/tools.py
index 4cbfa3b..a53c158 100644
--- a/tools.py
+++ b/tools.py
@@ -300,10 +300,10 @@ def get_node_virt ():
     except:
         pass
     logger.log("Computing virt..")
-    vs_retcod=subprocess.call ([ 'vserver', '--help' ])
-    if vs_retcod == 0:
-        virt='vs'
-    else:
+    try: 
+        if subprocess.call ([ 'vserver', '--help' ]) ==0: virt='vs'
+        else:                                             virt='lxc'      
+    except:
         virt='lxc'
     with file(virt_stamp,"w") as f:
         f.write(virt)