Merge pull request #634 from DarrinFong/docker_used_during_sing_exec_…

…#629 Docker used during sing exec
boutiques · Aug 20, 2020 · 733c1af · 733c1af
2 parents 94b80ba + f794c9e
commit 733c1af
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/tools/python/boutiques/localExec.py b/tools/python/boutiques/localExec.py
@@ -592,9 +592,8 @@ def _isCommandInstalled(self, command):
     # descriptor, executor options and if Docker is installed.
     def _chooseContainerTypeToUse(self, conType, forceSing=False,
                                   forceDocker=False):
-        if (self._isCommandInstalled('docker') and
-                (conType == 'docker' and not forceSing or
-                 forceDocker)):
+        if ((conType == 'docker' and not forceSing or forceDocker) and
+           self._isCommandInstalled('docker')):
             return "docker"
 
         if self._isCommandInstalled('singularity'):