testing with version 3 find

vsoch · vsoch · commit be22517d9756 · 2018-11-18T09:45:21.000-05:00
diff --git a/spython/instance/cmd/iutils.py b/spython/instance/cmd/iutils.py
@@ -51,7 +51,7 @@ def get(self, name, return_json=False, quiet=False):
 
     # Ensure compatible for singularity prior to 3.0, and after 3.0
     subgroup = "instance.list"
-    if get_singularity_version().startswith("3"):
+    if get_singularity_version().find("version 3"):
         subgroup = ["instance", "list"]
 
     cmd = self._init_command(subgroup)
diff --git a/spython/instance/cmd/start.py b/spython/instance/cmd/start.py
@@ -56,7 +56,7 @@ def start(self, image=None, name=None, sudo=False, options=[], capture=False):
 
     # Derive subgroup command based on singularity version
     subgroup = 'instance.start'
-    if get_singularity_version().startswith("3"):
+    if get_singularity_version().find("version 3"):
         subgroup = ["instance", "start"]
 
     cmd = self._init_command(subgroup)
diff --git a/spython/instance/cmd/stop.py b/spython/instance/cmd/stop.py
@@ -38,7 +38,7 @@ def stop(self, name=None, sudo=False):
     check_install()
 
     subgroup = 'instance.stop'
-    if get_singularity_version().startswith("3"):
+    if get_singularity_version().find("version 3"):
         subgroup = ["instance", "stop"]
 
     cmd = self._init_command(subgroup)
diff --git a/spython/main/instances.py b/spython/main/instances.py
@@ -43,7 +43,7 @@ def instances(self, name=None, return_json=False, quiet=False):
     check_install()
 
     subgroup = 'instance.list'
-    if get_singularity_version().startswith("3"):
+    if get_singularity_version().find("version 3"):
         subgroup = ["instance", "list"]
 
     cmd = self._init_command(subgroup)
diff --git a/spython/utils/terminal.py b/spython/utils/terminal.py
@@ -70,7 +70,8 @@ def get_singularity_version():
             return version
 
         if version['return_code'] == 0:
-            version = version['message'][0].strip('\n')
+            if len(version['message']) > 0:
+                version = version['message'][0].strip('\n')
 
     return version
 
