Skip to content

Fix Conda "Conda init bash" issue. #14455

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 2 commits into
base: 3.0-dev
Choose a base branch
from
Draft
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
17 changes: 12 additions & 5 deletions SPECS/conda/conda.spec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Summary: Cross-platform, Python-agnostic binary package manager
Name: conda
Version: 24.3.0
Release: 3%{?dist}
Release: 4%{?dist}
License: BSD-3-Clause AND Apache-2.0
# The conda code is BSD-3-Clause
# adapters/ftp.py is Apache-2.0
Expand Down Expand Up @@ -187,13 +187,15 @@ mkdir -p %{buildroot}%{_localstatedir}/cache/conda/pkgs/cache

# install does not create the directory on EL7
install -m 0644 -Dt %{buildroot}/etc/profile.d/ conda/shell/etc/profile.d/conda.{sh,csh}
install -m 0644 -Dt %{buildroot}/etc/profile.d/ conda/shell/conda.xsh

sed -r -i -e '1i [ -z "$CONDA_EXE" ] && CONDA_EXE=%{_bindir}/conda' \
-e '/PATH=.*condabin/s|PATH=|[ -d $(dirname "$CONDA_EXE")/condabin ] \&\& PATH=|' %{buildroot}/etc/profile.d/conda.sh
sed -r -i -e '1i set _CONDA_EXE=%{_bindir}/conda\nset _CONDA_ROOT=' \
-e 's/CONDA_PFX=.*/CONDA_PFX=/' %{buildroot}/etc/profile.d/conda.csh
install -m 0644 -Dt %{buildroot}%{_datadir}/fish/vendor_conf.d/ conda/shell/etc/fish/conf.d/conda.fish
install -m 0644 -Dt %{buildroot}/etc/fish/conf.d/ conda/shell/etc/fish/conf.d/conda.fish
sed -r -i -e '1i set -gx CONDA_EXE "/usr/bin/conda"\nset _CONDA_ROOT "/usr"\nset _CONDA_EXE "/usr/bin/conda"\nset -gx CONDA_PYTHON_EXE "/usr/bin/python3"' \
%{buildroot}%{_datadir}/fish/vendor_conf.d/conda.fish
%{buildroot}/etc/fish/conf.d/conda.fish

# Install bash completion script
install -m 0644 -Dt %{buildroot}%{bash_completionsdir}/ %SOURCE1
Expand Down Expand Up @@ -385,10 +387,11 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
%{_bindir}/conda-env
%{bash_completionsdir}/conda
# TODO - better ownership for fish/vendor_conf.d
%dir %{_datadir}/fish/vendor_conf.d
%{_datadir}/fish/vendor_conf.d/conda.fish
%dir /etc/fish/conf.d
/etc/fish/conf.d/conda.fish
/etc/profile.d/conda.sh
/etc/profile.d/conda.csh
/etc/profile.d/conda.xsh

%files tests
%{_datadir}/conda/tests/
Expand All @@ -402,6 +405,10 @@ PYTHONPATH=%{buildroot}%{python3_sitelib} conda info
%{_datadir}/conda/condarc.d/

%changelog
* Thu Aug 07 2025 Riken Maharjan <[email protected]> - 24.3.0-4
- Add missing conda.xsh file to /etc/profile.d
- also move conda.fish to /etc/fish/conf.d/

* Thu May 01 2025 Riken Maharjan <[email protected]> - 24.3.0-3
- Skip some test cases that are failing in the current version of conda using Fedora (License: MIT)

Expand Down
120 changes: 60 additions & 60 deletions toolkit/resources/manifests/package/pkggen_core_aarch64.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.aarch64.rpm
kernel-headers-6.6.96.1-2.azl3.noarch.rpm
kernel-headers-6.6.96.1-1.azl3.noarch.rpm
glibc-2.38-11.azl3.aarch64.rpm
glibc-devel-2.38-11.azl3.aarch64.rpm
glibc-i18n-2.38-11.azl3.aarch64.rpm
Expand Down Expand Up @@ -107,64 +107,64 @@ libpipeline-devel-1.5.7-1.azl3.aarch64.rpm
gdbm-1.23-1.azl3.aarch64.rpm
gdbm-devel-1.23-1.azl3.aarch64.rpm
gdbm-lang-1.23-1.azl3.aarch64.rpm
perl-B-1.88-509.azl3.aarch64.rpm
perl-Carp-1.54-509.azl3.noarch.rpm
perl-Class-Struct-0.68-509.azl3.noarch.rpm
perl-Data-Dumper-2.188-509.azl3.aarch64.rpm
perl-DynaLoader-1.54-509.azl3.aarch64.rpm
perl-Encode-3.19-509.azl3.aarch64.rpm
perl-Errno-1.37-509.azl3.aarch64.rpm
perl-Exporter-5.77-509.azl3.noarch.rpm
perl-Fcntl-1.15-509.azl3.aarch64.rpm
perl-File-Basename-2.86-509.azl3.noarch.rpm
perl-File-Compare-1.100.700-509.azl3.noarch.rpm
perl-File-Copy-2.41-509.azl3.noarch.rpm
perl-File-Path-2.18-509.azl3.noarch.rpm
perl-File-Temp-0.231.100-509.azl3.noarch.rpm
perl-File-stat-1.13-509.azl3.noarch.rpm
perl-FileHandle-2.05-509.azl3.noarch.rpm
perl-Getopt-Long-2.54-509.azl3.noarch.rpm
perl-Getopt-Std-1.13-509.azl3.noarch.rpm
perl-HTTP-Tiny-0.086-509.azl3.noarch.rpm
perl-I18N-Langinfo-0.22-509.azl3.aarch64.rpm
perl-IO-1.52-509.azl3.aarch64.rpm
perl-IPC-Open3-1.22-509.azl3.noarch.rpm
perl-MIME-Base64-3.16-509.azl3.aarch64.rpm
perl-POSIX-2.13-509.azl3.aarch64.rpm
perl-PathTools-3.89-509.azl3.aarch64.rpm
perl-Pod-Escapes-1.07-509.azl3.noarch.rpm
perl-Pod-Perldoc-3.28.01-509.azl3.noarch.rpm
perl-Pod-Simple-3.43-509.azl3.noarch.rpm
perl-Pod-Usage-2.03-509.azl3.noarch.rpm
perl-Scalar-List-Utils-1.63-509.azl3.aarch64.rpm
perl-SelectSaver-1.02-509.azl3.noarch.rpm
perl-Socket-2.036-509.azl3.aarch64.rpm
perl-Storable-3.32-509.azl3.aarch64.rpm
perl-Symbol-1.09-509.azl3.noarch.rpm
perl-Term-ANSIColor-5.01-509.azl3.noarch.rpm
perl-Term-Cap-1.18-509.azl3.noarch.rpm
perl-Text-ParseWords-3.31-509.azl3.noarch.rpm
perl-Text-Tabs+Wrap-2021.0814-509.azl3.noarch.rpm
perl-Thread-Queue-3.14-509.azl3.noarch.rpm
perl-Time-Local-1.300-509.azl3.noarch.rpm
perl-Unicode-Normalize-1.32-509.azl3.aarch64.rpm
perl-base-2.27-509.azl3.noarch.rpm
perl-constant-1.33-509.azl3.noarch.rpm
perl-if-0.61.000-509.azl3.noarch.rpm
perl-interpreter-5.38.2-509.azl3.aarch64.rpm
perl-libs-5.38.2-509.azl3.aarch64.rpm
perl-locale-1.10-509.azl3.noarch.rpm
perl-macros-5.38.2-509.azl3.noarch.rpm
perl-mro-1.28-509.azl3.aarch64.rpm
perl-overload-1.37-509.azl3.noarch.rpm
perl-overloading-0.02-509.azl3.noarch.rpm
perl-parent-0.241-509.azl3.noarch.rpm
perl-podlators-5.01-509.azl3.noarch.rpm
perl-subs-1.04-509.azl3.noarch.rpm
perl-threads-2.36-509.azl3.aarch64.rpm
perl-threads-shared-1.68-509.azl3.aarch64.rpm
perl-vars-1.05-509.azl3.noarch.rpm
perl-5.38.2-509.azl3.aarch64.rpm
perl-B-1.88-508.azl3.aarch64.rpm
perl-Carp-1.54-508.azl3.noarch.rpm
perl-Class-Struct-0.68-508.azl3.noarch.rpm
perl-Data-Dumper-2.188-508.azl3.aarch64.rpm
perl-DynaLoader-1.54-508.azl3.aarch64.rpm
perl-Encode-3.19-508.azl3.aarch64.rpm
perl-Errno-1.37-508.azl3.aarch64.rpm
perl-Exporter-5.77-508.azl3.noarch.rpm
perl-Fcntl-1.15-508.azl3.aarch64.rpm
perl-File-Basename-2.86-508.azl3.noarch.rpm
perl-File-Compare-1.100.700-508.azl3.noarch.rpm
perl-File-Copy-2.41-508.azl3.noarch.rpm
perl-File-Path-2.18-508.azl3.noarch.rpm
perl-File-Temp-0.231.100-508.azl3.noarch.rpm
perl-File-stat-1.13-508.azl3.noarch.rpm
perl-FileHandle-2.05-508.azl3.noarch.rpm
perl-Getopt-Long-2.54-508.azl3.noarch.rpm
perl-Getopt-Std-1.13-508.azl3.noarch.rpm
perl-HTTP-Tiny-0.086-508.azl3.noarch.rpm
perl-I18N-Langinfo-0.22-508.azl3.aarch64.rpm
perl-IO-1.52-508.azl3.aarch64.rpm
perl-IPC-Open3-1.22-508.azl3.noarch.rpm
perl-MIME-Base64-3.16-508.azl3.aarch64.rpm
perl-POSIX-2.13-508.azl3.aarch64.rpm
perl-PathTools-3.89-508.azl3.aarch64.rpm
perl-Pod-Escapes-1.07-508.azl3.noarch.rpm
perl-Pod-Perldoc-3.28.01-508.azl3.noarch.rpm
perl-Pod-Simple-3.43-508.azl3.noarch.rpm
perl-Pod-Usage-2.03-508.azl3.noarch.rpm
perl-Scalar-List-Utils-1.63-508.azl3.aarch64.rpm
perl-SelectSaver-1.02-508.azl3.noarch.rpm
perl-Socket-2.036-508.azl3.aarch64.rpm
perl-Storable-3.32-508.azl3.aarch64.rpm
perl-Symbol-1.09-508.azl3.noarch.rpm
perl-Term-ANSIColor-5.01-508.azl3.noarch.rpm
perl-Term-Cap-1.18-508.azl3.noarch.rpm
perl-Text-ParseWords-3.31-508.azl3.noarch.rpm
perl-Text-Tabs+Wrap-2021.0814-508.azl3.noarch.rpm
perl-Thread-Queue-3.14-508.azl3.noarch.rpm
perl-Time-Local-1.300-508.azl3.noarch.rpm
perl-Unicode-Normalize-1.32-508.azl3.aarch64.rpm
perl-base-2.27-508.azl3.noarch.rpm
perl-constant-1.33-508.azl3.noarch.rpm
perl-if-0.61.000-508.azl3.noarch.rpm
perl-interpreter-5.38.2-508.azl3.aarch64.rpm
perl-libs-5.38.2-508.azl3.aarch64.rpm
perl-locale-1.10-508.azl3.noarch.rpm
perl-macros-5.38.2-508.azl3.noarch.rpm
perl-mro-1.28-508.azl3.aarch64.rpm
perl-overload-1.37-508.azl3.noarch.rpm
perl-overloading-0.02-508.azl3.noarch.rpm
perl-parent-0.241-508.azl3.noarch.rpm
perl-podlators-5.01-508.azl3.noarch.rpm
perl-subs-1.04-508.azl3.noarch.rpm
perl-threads-2.36-508.azl3.aarch64.rpm
perl-threads-shared-1.68-508.azl3.aarch64.rpm
perl-vars-1.05-508.azl3.noarch.rpm
perl-5.38.2-508.azl3.aarch64.rpm
texinfo-7.0.3-1.azl3.aarch64.rpm
gtk-doc-1.33.2-1.azl3.noarch.rpm
autoconf-2.72-2.azl3.noarch.rpm
Expand Down Expand Up @@ -222,7 +222,7 @@ tdnf-plugin-repogpgcheck-3.5.8-7.azl3.aarch64.rpm
libassuan-2.5.6-1.azl3.aarch64.rpm
libassuan-devel-2.5.6-1.azl3.aarch64.rpm
libgpg-error-1.48-1.azl3.aarch64.rpm
libgcrypt-1.10.3-1.azl3.aarch64.rpm
libgcrypt-1.10.2-1.azl3.aarch64.rpm
libksba-1.6.4-1.azl3.aarch64.rpm
libksba-devel-1.6.4-1.azl3.aarch64.rpm
libxslt-1.1.43-1.azl3.aarch64.rpm
Expand Down
120 changes: 60 additions & 60 deletions toolkit/resources/manifests/package/pkggen_core_x86_64.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
filesystem-1.1-21.azl3.x86_64.rpm
kernel-headers-6.6.96.1-2.azl3.noarch.rpm
kernel-headers-6.6.96.1-1.azl3.noarch.rpm
glibc-2.38-11.azl3.x86_64.rpm
glibc-devel-2.38-11.azl3.x86_64.rpm
glibc-i18n-2.38-11.azl3.x86_64.rpm
Expand Down Expand Up @@ -107,64 +107,64 @@ libpipeline-devel-1.5.7-1.azl3.x86_64.rpm
gdbm-1.23-1.azl3.x86_64.rpm
gdbm-devel-1.23-1.azl3.x86_64.rpm
gdbm-lang-1.23-1.azl3.x86_64.rpm
perl-B-1.88-509.azl3.x86_64.rpm
perl-Carp-1.54-509.azl3.noarch.rpm
perl-Class-Struct-0.68-509.azl3.noarch.rpm
perl-Data-Dumper-2.188-509.azl3.x86_64.rpm
perl-DynaLoader-1.54-509.azl3.x86_64.rpm
perl-Encode-3.19-509.azl3.x86_64.rpm
perl-Errno-1.37-509.azl3.x86_64.rpm
perl-Exporter-5.77-509.azl3.noarch.rpm
perl-Fcntl-1.15-509.azl3.x86_64.rpm
perl-File-Basename-2.86-509.azl3.noarch.rpm
perl-File-Compare-1.100.700-509.azl3.noarch.rpm
perl-File-Copy-2.41-509.azl3.noarch.rpm
perl-File-Path-2.18-509.azl3.noarch.rpm
perl-File-Temp-0.231.100-509.azl3.noarch.rpm
perl-File-stat-1.13-509.azl3.noarch.rpm
perl-FileHandle-2.05-509.azl3.noarch.rpm
perl-Getopt-Long-2.54-509.azl3.noarch.rpm
perl-Getopt-Std-1.13-509.azl3.noarch.rpm
perl-HTTP-Tiny-0.086-509.azl3.noarch.rpm
perl-I18N-Langinfo-0.22-509.azl3.x86_64.rpm
perl-IO-1.52-509.azl3.x86_64.rpm
perl-IPC-Open3-1.22-509.azl3.noarch.rpm
perl-MIME-Base64-3.16-509.azl3.x86_64.rpm
perl-POSIX-2.13-509.azl3.x86_64.rpm
perl-PathTools-3.89-509.azl3.x86_64.rpm
perl-Pod-Escapes-1.07-509.azl3.noarch.rpm
perl-Pod-Perldoc-3.28.01-509.azl3.noarch.rpm
perl-Pod-Simple-3.43-509.azl3.noarch.rpm
perl-Pod-Usage-2.03-509.azl3.noarch.rpm
perl-Scalar-List-Utils-1.63-509.azl3.x86_64.rpm
perl-SelectSaver-1.02-509.azl3.noarch.rpm
perl-Socket-2.036-509.azl3.x86_64.rpm
perl-Storable-3.32-509.azl3.x86_64.rpm
perl-Symbol-1.09-509.azl3.noarch.rpm
perl-Term-ANSIColor-5.01-509.azl3.noarch.rpm
perl-Term-Cap-1.18-509.azl3.noarch.rpm
perl-Text-ParseWords-3.31-509.azl3.noarch.rpm
perl-Text-Tabs+Wrap-2021.0814-509.azl3.noarch.rpm
perl-Thread-Queue-3.14-509.azl3.noarch.rpm
perl-Time-Local-1.300-509.azl3.noarch.rpm
perl-Unicode-Normalize-1.32-509.azl3.x86_64.rpm
perl-base-2.27-509.azl3.noarch.rpm
perl-constant-1.33-509.azl3.noarch.rpm
perl-if-0.61.000-509.azl3.noarch.rpm
perl-interpreter-5.38.2-509.azl3.x86_64.rpm
perl-libs-5.38.2-509.azl3.x86_64.rpm
perl-locale-1.10-509.azl3.noarch.rpm
perl-macros-5.38.2-509.azl3.noarch.rpm
perl-mro-1.28-509.azl3.x86_64.rpm
perl-overload-1.37-509.azl3.noarch.rpm
perl-overloading-0.02-509.azl3.noarch.rpm
perl-parent-0.241-509.azl3.noarch.rpm
perl-podlators-5.01-509.azl3.noarch.rpm
perl-subs-1.04-509.azl3.noarch.rpm
perl-threads-2.36-509.azl3.x86_64.rpm
perl-threads-shared-1.68-509.azl3.x86_64.rpm
perl-vars-1.05-509.azl3.noarch.rpm
perl-5.38.2-509.azl3.x86_64.rpm
perl-B-1.88-508.azl3.x86_64.rpm
perl-Carp-1.54-508.azl3.noarch.rpm
perl-Class-Struct-0.68-508.azl3.noarch.rpm
perl-Data-Dumper-2.188-508.azl3.x86_64.rpm
perl-DynaLoader-1.54-508.azl3.x86_64.rpm
perl-Encode-3.19-508.azl3.x86_64.rpm
perl-Errno-1.37-508.azl3.x86_64.rpm
perl-Exporter-5.77-508.azl3.noarch.rpm
perl-Fcntl-1.15-508.azl3.x86_64.rpm
perl-File-Basename-2.86-508.azl3.noarch.rpm
perl-File-Compare-1.100.700-508.azl3.noarch.rpm
perl-File-Copy-2.41-508.azl3.noarch.rpm
perl-File-Path-2.18-508.azl3.noarch.rpm
perl-File-Temp-0.231.100-508.azl3.noarch.rpm
perl-File-stat-1.13-508.azl3.noarch.rpm
perl-FileHandle-2.05-508.azl3.noarch.rpm
perl-Getopt-Long-2.54-508.azl3.noarch.rpm
perl-Getopt-Std-1.13-508.azl3.noarch.rpm
perl-HTTP-Tiny-0.086-508.azl3.noarch.rpm
perl-I18N-Langinfo-0.22-508.azl3.x86_64.rpm
perl-IO-1.52-508.azl3.x86_64.rpm
perl-IPC-Open3-1.22-508.azl3.noarch.rpm
perl-MIME-Base64-3.16-508.azl3.x86_64.rpm
perl-POSIX-2.13-508.azl3.x86_64.rpm
perl-PathTools-3.89-508.azl3.x86_64.rpm
perl-Pod-Escapes-1.07-508.azl3.noarch.rpm
perl-Pod-Perldoc-3.28.01-508.azl3.noarch.rpm
perl-Pod-Simple-3.43-508.azl3.noarch.rpm
perl-Pod-Usage-2.03-508.azl3.noarch.rpm
perl-Scalar-List-Utils-1.63-508.azl3.x86_64.rpm
perl-SelectSaver-1.02-508.azl3.noarch.rpm
perl-Socket-2.036-508.azl3.x86_64.rpm
perl-Storable-3.32-508.azl3.x86_64.rpm
perl-Symbol-1.09-508.azl3.noarch.rpm
perl-Term-ANSIColor-5.01-508.azl3.noarch.rpm
perl-Term-Cap-1.18-508.azl3.noarch.rpm
perl-Text-ParseWords-3.31-508.azl3.noarch.rpm
perl-Text-Tabs+Wrap-2021.0814-508.azl3.noarch.rpm
perl-Thread-Queue-3.14-508.azl3.noarch.rpm
perl-Time-Local-1.300-508.azl3.noarch.rpm
perl-Unicode-Normalize-1.32-508.azl3.x86_64.rpm
perl-base-2.27-508.azl3.noarch.rpm
perl-constant-1.33-508.azl3.noarch.rpm
perl-if-0.61.000-508.azl3.noarch.rpm
perl-interpreter-5.38.2-508.azl3.x86_64.rpm
perl-libs-5.38.2-508.azl3.x86_64.rpm
perl-locale-1.10-508.azl3.noarch.rpm
perl-macros-5.38.2-508.azl3.noarch.rpm
perl-mro-1.28-508.azl3.x86_64.rpm
perl-overload-1.37-508.azl3.noarch.rpm
perl-overloading-0.02-508.azl3.noarch.rpm
perl-parent-0.241-508.azl3.noarch.rpm
perl-podlators-5.01-508.azl3.noarch.rpm
perl-subs-1.04-508.azl3.noarch.rpm
perl-threads-2.36-508.azl3.x86_64.rpm
perl-threads-shared-1.68-508.azl3.x86_64.rpm
perl-vars-1.05-508.azl3.noarch.rpm
perl-5.38.2-508.azl3.x86_64.rpm
texinfo-7.0.3-1.azl3.x86_64.rpm
gtk-doc-1.33.2-1.azl3.noarch.rpm
autoconf-2.72-2.azl3.noarch.rpm
Expand Down Expand Up @@ -222,7 +222,7 @@ tdnf-plugin-repogpgcheck-3.5.8-7.azl3.x86_64.rpm
libassuan-2.5.6-1.azl3.x86_64.rpm
libassuan-devel-2.5.6-1.azl3.x86_64.rpm
libgpg-error-1.48-1.azl3.x86_64.rpm
libgcrypt-1.10.3-1.azl3.x86_64.rpm
libgcrypt-1.10.2-1.azl3.x86_64.rpm
libksba-1.6.4-1.azl3.x86_64.rpm
libksba-devel-1.6.4-1.azl3.x86_64.rpm
libxslt-1.1.43-1.azl3.x86_64.rpm
Expand Down
Loading
Loading