Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion constructor/header.sh
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ chmod +x "$CONDA_EXEC"

{%- if conda_exe_name != "_conda" %}
# In case there are packages that depend on _conda
ln -s "$CONDA_EXEC" "$PREFIX"/_conda
ln -s -f "$CONDA_EXEC" "$PREFIX"/_conda
{%- endif %}

{%- for filename, (start, end, executable) in conda_exe_payloads|items %}
Expand Down
2 changes: 1 addition & 1 deletion constructor/osx/prepare_installation.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ chmod +x "$CONDA_EXEC"

{%- if conda_exe_name != "_conda" %}
# In case there are packages that depend on _conda
ln -s "$CONDA_EXEC" "$PREFIX"/_conda
ln -s -f "$CONDA_EXEC" "$PREFIX"/_conda
{%- endif %}

# Create a blank history file so conda thinks this is an existing env
Expand Down
3 changes: 3 additions & 0 deletions news/1135-fix-symbolic-linking
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
### Bug fixes

* Force symbolic linking of `_conda` in SH and PKG installers. This fixes a regression introduced by #1090 that made installations fail if `_conda` already exists in the target location. (#1135)
Loading