folkslinux
/
mamba
mirror of https://github.com/mamba-org/mamba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix output (#3428) 

Only print activation message when target prefix is not active
This commit is contained in:
Hind-M 2024-09-02 14:25:20 +02:00 committed by GitHub
parent 4f73c92713
commit 1bdf6f1748
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libmamba/src/core/transaction.cpp
View File

@ -30,6 +30,7 @@
#include "mamba/core/util_os.hpp" #include "mamba/core/util_os.hpp"
#include "mamba/solver/libsolv/database.hpp" #include "mamba/solver/libsolv/database.hpp"
#include "mamba/specs/match_spec.hpp" #include "mamba/specs/match_spec.hpp"
#include "mamba/util/environment.hpp"
#include "mamba/util/variant_cmp.hpp" #include "mamba/util/variant_cmp.hpp"
#include "solver/helpers.hpp" #include "solver/helpers.hpp"
@ -445,19 +446,27 @@ namespace mamba
// Get the name of the environment // Get the name of the environment
const auto environment = env_name(ctx); const auto environment = env_name(ctx);
Console::stream() << "\nTransaction finished\n\n" // Check if the target prefix is active
"To activate this environment, use:\n\n" if (util::get_env("CONDA_PREFIX") == ctx.prefix_params.target_prefix)
" " {
<< executable << " activate " << environment Console::stream() << "\nTransaction finished\n";
<< "\n\n" }
"Or to execute a single command in this environment, use:\n\n" else
" " {
<< executable Console::stream() << "\nTransaction finished\n\n"
<< " run " "To activate this environment, use:\n\n"
// Use -n or -p depending on if the env_name is a full prefix or just " "
// a name. << executable << " activate " << environment
<< (environment == ctx.prefix_params.target_prefix ? "-p " : "-n ") << "\n\n"
<< environment << " mycommand\n"; "Or to execute a single command in this environment, use:\n\n"
" "
<< executable
<< " run "
// Use -n or -p depending on if the env_name is a full prefix or just
// a name.
<< (environment == ctx.prefix_params.target_prefix ? "-p " : "-n ")
<< environment << " mycommand\n";
}
prefix.history().add_entry(m_history_entry); prefix.history().add_entry(m_history_entry);
return true; return true;