Skip to content

Commit e87e4db

Browse files
committed
More logging
1 parent 52b4e23 commit e87e4db

File tree

1 file changed

+58
-1
lines changed

1 file changed

+58
-1
lines changed

crates/pet-conda/src/environments.rs

Lines changed: 58 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,13 +179,26 @@ fn get_conda_env_name(
179179
.file_name()
180180
.map(|name| name.to_str().unwrap_or_default().to_string());
181181
}
182+
183+
trace!(
184+
"1. Conda env name for {:?}, {:?} is {:?}",
185+
env_path,
186+
prefix,
187+
name
188+
);
182189
// if the conda install folder is parent of the env folder, then we can use named activation.
183190
// E.g. conda env is = <conda install>/envs/<env name>
184191
// Then we can use `<conda install>/bin/conda activate -n <env name>`
185192
if let Some(conda_dir) = conda_dir {
193+
trace!("2. Conda env name for {:?} is {:?}", env_path, name);
186194
if !prefix.starts_with(conda_dir) {
187195
name = get_conda_env_name_from_history_file(env_path, prefix);
196+
trace!("3. Conda env name for {:?} is {:?}", env_path, name);
197+
} else {
198+
trace!("4. Conda env name for {:?} is {:?}", env_path, name);
188199
}
200+
} else {
201+
trace!("5. Conda env name for {:?} is {:?}", env_path, name);
189202
}
190203

191204
name
@@ -202,17 +215,61 @@ fn get_conda_env_name_from_history_file(env_path: &Path, prefix: &Path) -> Optio
202215
let name = prefix
203216
.file_name()
204217
.map(|name| name.to_str().unwrap_or_default().to_string());
205-
218+
trace!(
219+
"6. Conda env name for {:?}, {:?} is {:?}",
220+
env_path,
221+
prefix,
222+
name
223+
);
206224
if let Some(name) = name {
225+
trace!(
226+
"7. Conda env name for {:?}, {:?} is {:?}",
227+
env_path,
228+
prefix,
229+
name
230+
);
207231
if let Some(line) = get_conda_creation_line_from_history(env_path) {
232+
trace!(
233+
"8. Conda env name for {:?}, {:?} is {:?}",
234+
env_path,
235+
prefix,
236+
name
237+
);
208238
// Sample lines
209239
// # cmd: <conda install directory>\Scripts\conda-script.py create -n samlpe1
210240
// # cmd: <conda install directory>\Scripts\conda-script.py create -p <full path>
211241
// # cmd: /Users/donjayamanne/miniconda3/bin/conda create -n conda1
212242
if is_conda_env_name_in_cmd(line, &name) {
243+
trace!(
244+
"9. Conda env name for {:?}, {:?} is {:?}",
245+
env_path,
246+
prefix,
247+
name
248+
);
213249
return Some(name);
250+
} else {
251+
trace!(
252+
"10. Conda env name for {:?}, {:?} is {:?}",
253+
env_path,
254+
prefix,
255+
name
256+
);
214257
}
258+
} else {
259+
trace!(
260+
"11. Conda env name for {:?}, {:?} is {:?}",
261+
env_path,
262+
prefix,
263+
name
264+
);
215265
}
266+
} else {
267+
trace!(
268+
"12. Conda env name for {:?}, {:?} is {:?}",
269+
env_path,
270+
prefix,
271+
name
272+
);
216273
}
217274
None
218275
}

0 commit comments

Comments
 (0)