Merge pull request #45 from gogetdata/update_prefix_search

Update prefix base tracking
gogetdata · Oct 1, 2020 · 51d527f · 51d527f
2 parents ccf18a4 + d88b76d
commit 51d527f
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/ggd/utils.py b/ggd/utils.py
@@ -703,9 +703,6 @@ def prefix_in_conda(prefix):
         env_var_names[name] = env_path.rstrip("/")
         env_var_paths[env_path.rstrip("/")] = name
 
-    ## Get the base/first conda environment
-    cbase = min(env_var_paths.keys())
-
     prefix = prefix.rstrip("/")
 
     ## Check that the file is in the environment lists
@@ -715,6 +712,9 @@ def prefix_in_conda(prefix):
     ## Get the prefix path dd
     prefix_path = get_conda_prefix_path(prefix)
 
+    ## Get the base/first conda environment for all environments that are subdirs of the specified prefix
+    cbase = min([x for x in env_var_paths.keys() if x in prefix_path])
+
     ## Check that the file path includes the conda base directory
     if cbase not in prefix_path:
         raise CondaEnvironmentNotFound(prefix)