Commit 8e5b886f authored by TotallyNotElite's avatar TotallyNotElite

Dependency fixes

parent 0376ee15
......@@ -294,6 +294,9 @@ std::vector<std::shared_ptr<Config>> Data::getAllLocalConflicts(std::shared_ptr<
// Then loop thru all already installed configs. If there are no configs installed, there can not be a conflict
for (auto& installedConfig : installedConfigs)
{
// Skip yourself
if (installedConfig->name_ == config->name_)
continue;
// Does one of the installed configs conflict one of the to-be-installed configs?
if (!fnmatch(dependencyConflict.c_str(),installedConfig->name_.c_str(), FNM_CASEFOLD))
{
......
......@@ -62,12 +62,8 @@ bool Mhwd::performTransaction(std::shared_ptr<Config> config, MHWD::TRANSACTIONT
// Print dependencies
else if (!transaction.dependencyConfigs_.empty())
{
consoleWriter_.printStatus("Dependencies to install:" +
gatherConfigContent(transaction.dependencyConfigs_) +
"\nProceed with installation? [Y/n]");
std::string input;
std::getline(std::cin, input);
return proceedWithInstallation(input);
consoleWriter_.printStatus("Dependencies to install: " +
gatherConfigContent(transaction.dependencyConfigs_));
}
}
else if (MHWD::TRANSACTIONTYPE::REMOVE == transactionType)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment