More updates

Author: DonJayamanne

crates/pet-conda/src/environments.rs

@@ -147,11 +147,8 @@ pub fn get_conda_installation_used_to_create_conda_env(env_path: &Path) -> Optio
         }
     }
 
-    // Possible the env_path is the root conda install folder.
-    if is_conda_install(env_path) {
-        return Some(env_path.to_path_buf());
-    }
-
+    // First look for the conda-meta/history file in the environment folder.
+    // This could be a conda envirment (not root) but has `conda` installed in it.
     let conda_meta_history = env_path.join("conda-meta").join("history");
     if let Ok(reader) = std::fs::read_to_string(conda_meta_history.clone()) {
         if let Some(line) = reader.lines().map(|l| l.trim()).find(|l| {
@@ -169,7 +166,12 @@ pub fn get_conda_installation_used_to_create_conda_env(env_path: &Path) -> Optio
         }
     }
 
-    None
+    // Possible the env_path is the root conda install folder.
+    if is_conda_install(env_path) {
+        Some(env_path.to_path_buf())
+    } else {
+        None
+    }
 }
 
 fn get_conda_dir_from_cmd(cmd_line: String) -> Option<PathBuf> {

crates/pet-conda/src/manager.rs

@@ -106,7 +106,7 @@ impl CondaManager {
             // If this is a conda env and the parent is `.conda/envs`, then this is definitely NOT a root conda install folder.
             // Hence never use conda installs from these env paths.
             if let Some(parent) = path.parent() {
-                if parent.ends_with(".conda/envs") {
+                if parent.ends_with(".conda/envs") || parent.ends_with(".conda\\envs") {
                     trace!(
                         "Parent path ends with .conda/envs, not a root conda install folder: {:?}",
                         parent