Skip to content

Commit d908fe1

Browse files
authored
Merge 24.7.x back into main (#5436)
2 parents 417d3f4 + e0944e8 commit d908fe1

File tree

3 files changed

+18
-3
lines changed

3 files changed

+18
-3
lines changed

.authors.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1202,7 +1202,7 @@
12021202
alternate_emails:
12031203
12041204
- name: Ken Odegard
1205-
num_commits: 212
1205+
num_commits: 213
12061206
12071207
first_commit: 2020-09-08 19:53:41
12081208
github: kenodegard
@@ -1251,7 +1251,7 @@
12511251
github: beeankha
12521252
alternate_emails:
12531253
1254-
num_commits: 36
1254+
num_commits: 34
12551255
first_commit: 2022-01-19 16:40:06
12561256
- name: Conda Bot
12571257

CHANGELOG.md

+12
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
[//]: # (current developments)
22

3+
## 24.7.1 (2024-07-30)
4+
5+
### Bug fixes
6+
7+
* Check for WSL existence before calling `os.stat`. (#5433 via #5434)
8+
9+
### Contributors
10+
11+
* @kenodegard
12+
13+
14+
315
## 24.7.0 (2024-07-18)
416

517
### Enhancements

conda_build/build.py

+4-1
Original file line numberDiff line numberDiff line change
@@ -1738,7 +1738,10 @@ def bundle_conda(
17381738
if (
17391739
# WSL bash is always the same path, it is an alias to the default
17401740
# distribution as configured by the user
1741-
on_win and Path("C:\\Windows\\System32\\bash.exe").samefile(args[0])
1741+
on_win
1742+
# check if WSL is installed before calling Path.samefile/os.stat
1743+
and (wsl_bash := Path("C:\\Windows\\System32\\bash.exe")).exists()
1744+
and wsl_bash.samefile(args[0])
17421745
):
17431746
raise CondaBuildUserError(
17441747
"WSL bash.exe is not supported. Please use MSYS2 packages. Add "

0 commit comments

Comments
 (0)