Skip to content
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.

Sign up for GitHub

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

base: Add repository to solver problem messages #1464

Merged
merged 4 commits into from
May 27, 2024
+157 −66
Merged

base: Add repository to solver problem messages #1464

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
342f429
base: Add repository to solver problem messages
m-blaha Apr 30, 2024
2029f3d
base: Deduplicate solver problem messages
m-blaha May 2, 2024
e88c6e0
base: Remove trailing space from RULE_UPDATE message
m-blaha May 2, 2024
cc76aad
base: Enhance installed pkgs solver problems reporting
m-blaha May 22, 2024
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: 2 additions & 0 deletions include/libdnf5/base/goal_elements.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,8 @@ enum class ProblemRules {
RULE_MODULE_PKG_SELF_CONFLICT,
RULE_MODULE_YUMOBS,
RULE_MODULE_UNKNOWN,
RULE_PKG_INSTALLED_CONFLICTS,
RULE_PKG_INSTALLED_REQUIRES,
};

/// Define a type of information, hint, or problem gathered during libdnf5::Goal::resolve()
Expand Down
108 changes: 67 additions & 41 deletions libdnf5/base/solver_problems.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ namespace {
// TODO(jmracek) Translation must be done later. After setting the locale.
static const std::map<ProblemRules, BgettextMessage> PKG_PROBLEMS_DICT = {
{ProblemRules::RULE_DISTUPGRADE, M_("{} does not belong to a distupgrade repository")},
{ProblemRules::RULE_INFARCH, M_("{} has inferior architecture")},
{ProblemRules::RULE_UPDATE, M_("problem with installed package ")},
{ProblemRules::RULE_INFARCH, M_("{0} from {1} has inferior architecture")},
{ProblemRules::RULE_UPDATE, M_("problem with installed package")},
{ProblemRules::RULE_JOB, M_("conflicting requests")},
{ProblemRules::RULE_JOB_UNSUPPORTED, M_("unsupported request")},
{ProblemRules::RULE_JOB_NOTHING_PROVIDES_DEP, M_("nothing provides requested {}")},
Expand All @@ -49,19 +49,25 @@ static const std::map<ProblemRules, BgettextMessage> PKG_PROBLEMS_DICT = {
{ProblemRules::RULE_PKG, M_("some dependency problem")},
{ProblemRules::RULE_BEST_1, M_("cannot install the best update candidate for package {}")},
{ProblemRules::RULE_BEST_2, M_("cannot install the best candidate for the job")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_1, M_("package {} is filtered out by modular filtering")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_2, M_("package {} does not have a compatible architecture")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_3, M_("package {} is not installable")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_4, M_("package {} is filtered out by exclude filtering")},
{ProblemRules::RULE_PKG_NOTHING_PROVIDES_DEP, M_("nothing provides {0} needed by {1}")},
{ProblemRules::RULE_PKG_SAME_NAME, M_("cannot install both {0} and {1}")},
{ProblemRules::RULE_PKG_CONFLICTS, M_("package {0} conflicts with {1} provided by {2}")},
{ProblemRules::RULE_PKG_OBSOLETES, M_("package {0} obsoletes {1} provided by {2}")},
{ProblemRules::RULE_PKG_INSTALLED_OBSOLETES, M_("installed package {0} obsoletes {1} provided by {2}")},
{ProblemRules::RULE_PKG_IMPLICIT_OBSOLETES, M_("package {0} implicitly obsoletes {1} provided by {2}")},
{ProblemRules::RULE_PKG_REQUIRES, M_("package {1} requires {0}, but none of the providers can be installed")},
{ProblemRules::RULE_PKG_SELF_CONFLICT, M_("package {1} conflicts with {0} provided by itself")},
{ProblemRules::RULE_YUMOBS, M_("both package {0} and {2} obsolete {1}")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_1, M_("package {0} from {1} is filtered out by modular filtering")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_2, M_("package {0} from {1} does not have a compatible architecture")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_3, M_("package {0} from {1} is not installable")},
{ProblemRules::RULE_PKG_NOT_INSTALLABLE_4, M_("package {0} from {1} is filtered out by exclude filtering")},
{ProblemRules::RULE_PKG_NOTHING_PROVIDES_DEP, M_("nothing provides {0} needed by {1} from {2}")},
{ProblemRules::RULE_PKG_SAME_NAME, M_("cannot install both {0} from {1} and {2} from {3}")},
{ProblemRules::RULE_PKG_CONFLICTS, M_("package {0} from {1} conflicts with {2} provided by {3} from {4}")},
{ProblemRules::RULE_PKG_INSTALLED_CONFLICTS,
M_("installed package {0} conflicts with {1} provided by {2} from {3}")},
{ProblemRules::RULE_PKG_OBSOLETES, M_("package {0} from {1} obsoletes {2} provided by {3} from {4}")},
{ProblemRules::RULE_PKG_INSTALLED_OBSOLETES, M_("installed package {0} obsoletes {1} provided by {2} from {3}")},
{ProblemRules::RULE_PKG_IMPLICIT_OBSOLETES,
M_("package {0} from {1} implicitly obsoletes {2} provided by {3} from {4}")},
{ProblemRules::RULE_PKG_REQUIRES,
M_("package {1} from {2} requires {0}, but none of the providers can be installed")},
{ProblemRules::RULE_PKG_INSTALLED_REQUIRES,
M_("installed package {1} requires {0}, but none of the providers can be installed")},
{ProblemRules::RULE_PKG_SELF_CONFLICT, M_("package {0} from {1} conflicts with {2} provided by itself")},
{ProblemRules::RULE_YUMOBS, M_("both package {0} from {1} and {3} from {4} obsolete {2}")},
{ProblemRules::RULE_PKG_REMOVAL_OF_PROTECTED,
M_("The operation would result in removing"
" the following protected packages: {}")},
Expand Down Expand Up @@ -179,17 +185,24 @@ SolverProblems::~SolverProblems() = default;

std::string SolverProblems::problem_to_string(const std::pair<ProblemRules, std::vector<std::string>> & raw) {
switch (raw.first) {
case ProblemRules::RULE_JOB:
case ProblemRules::RULE_JOB_UNSUPPORTED:
case ProblemRules::RULE_PKG:
case ProblemRules::RULE_BEST_2:
case ProblemRules::RULE_MODULE_JOB:
case ProblemRules::RULE_MODULE_JOB_UNSUPPORTED:
case ProblemRules::RULE_MODULE_PKG:
case ProblemRules::RULE_MODULE_BEST_2:
if (raw.second.size() != 0) {
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return TM_(PKG_PROBLEMS_DICT.at(raw.first), 1);
case ProblemRules::RULE_DISTUPGRADE:
case ProblemRules::RULE_INFARCH:
case ProblemRules::RULE_UPDATE:
case ProblemRules::RULE_JOB_NOTHING_PROVIDES_DEP:
case ProblemRules::RULE_JOB_UNKNOWN_PACKAGE:
case ProblemRules::RULE_JOB_PROVIDED_BY_SYSTEM:
case ProblemRules::RULE_BEST_1:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_1:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_2:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_3:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_4:
case ProblemRules::RULE_MODULE_DISTUPGRADE:
case ProblemRules::RULE_MODULE_INFARCH:
case ProblemRules::RULE_MODULE_UPDATE:
Expand All @@ -205,35 +218,23 @@ std::string SolverProblems::problem_to_string(const std::pair<ProblemRules, std:
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return utils::sformat(TM_(PKG_PROBLEMS_DICT.at(raw.first), 1), raw.second[0]);
case ProblemRules::RULE_JOB:
case ProblemRules::RULE_JOB_UNSUPPORTED:
case ProblemRules::RULE_PKG:
case ProblemRules::RULE_BEST_2:
case ProblemRules::RULE_MODULE_JOB:
case ProblemRules::RULE_MODULE_JOB_UNSUPPORTED:
case ProblemRules::RULE_MODULE_PKG:
case ProblemRules::RULE_MODULE_BEST_2:
if (raw.second.size() != 0) {
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return TM_(PKG_PROBLEMS_DICT.at(raw.first), 1);
case ProblemRules::RULE_PKG_NOTHING_PROVIDES_DEP:
case ProblemRules::RULE_PKG_REQUIRES:
case ProblemRules::RULE_PKG_SELF_CONFLICT:
case ProblemRules::RULE_PKG_SAME_NAME:
case ProblemRules::RULE_INFARCH:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_1:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_2:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_3:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_4:
case ProblemRules::RULE_MODULE_PKG_NOTHING_PROVIDES_DEP:
case ProblemRules::RULE_MODULE_PKG_REQUIRES:
case ProblemRules::RULE_MODULE_PKG_SELF_CONFLICT:
case ProblemRules::RULE_MODULE_PKG_SAME_NAME:
case ProblemRules::RULE_PKG_INSTALLED_REQUIRES:
if (raw.second.size() != 2) {
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return utils::sformat(TM_(PKG_PROBLEMS_DICT.at(raw.first), 1), raw.second[0], raw.second[1]);
case ProblemRules::RULE_PKG_CONFLICTS:
case ProblemRules::RULE_PKG_OBSOLETES:
case ProblemRules::RULE_PKG_INSTALLED_OBSOLETES:
case ProblemRules::RULE_PKG_IMPLICIT_OBSOLETES:
case ProblemRules::RULE_YUMOBS:
case ProblemRules::RULE_PKG_NOTHING_PROVIDES_DEP:
case ProblemRules::RULE_PKG_REQUIRES:
case ProblemRules::RULE_PKG_SELF_CONFLICT:
case ProblemRules::RULE_MODULE_PKG_CONFLICTS:
case ProblemRules::RULE_MODULE_PKG_OBSOLETES:
case ProblemRules::RULE_MODULE_PKG_INSTALLED_OBSOLETES:
Expand All @@ -243,6 +244,28 @@ std::string SolverProblems::problem_to_string(const std::pair<ProblemRules, std:
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return utils::sformat(TM_(PKG_PROBLEMS_DICT.at(raw.first), 1), raw.second[0], raw.second[1], raw.second[2]);
case ProblemRules::RULE_PKG_SAME_NAME:
case ProblemRules::RULE_PKG_INSTALLED_CONFLICTS:
case ProblemRules::RULE_PKG_INSTALLED_OBSOLETES:
if (raw.second.size() != 4) {
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return utils::sformat(
TM_(PKG_PROBLEMS_DICT.at(raw.first), 1), raw.second[0], raw.second[1], raw.second[2], raw.second[3]);
case ProblemRules::RULE_PKG_CONFLICTS:
case ProblemRules::RULE_PKG_OBSOLETES:
case ProblemRules::RULE_PKG_IMPLICIT_OBSOLETES:
case ProblemRules::RULE_YUMOBS:
if (raw.second.size() != 5) {
throw std::invalid_argument("Incorrect number of elements for a problem rule");
}
return utils::sformat(
TM_(PKG_PROBLEMS_DICT.at(raw.first), 1),
raw.second[0],
raw.second[1],
raw.second[2],
raw.second[3],
raw.second[4]);
case ProblemRules::RULE_UNKNOWN:
case ProblemRules::RULE_MODULE_UNKNOWN:
if (raw.second.size() != 0) {
Expand Down Expand Up @@ -283,6 +306,7 @@ std::string SolverProblems::to_string() const {
return output;
}


std::vector<std::vector<std::pair<libdnf5::ProblemRules, std::vector<std::string>>>> SolverProblems::get_problems()
const {
return p_impl->problems;
Expand Down Expand Up @@ -383,10 +407,12 @@ std::vector<std::vector<std::pair<libdnf5::ProblemRules, std::vector<std::string
case ProblemRules::RULE_PKG_NOTHING_PROVIDES_DEP:
case ProblemRules::RULE_PKG_SAME_NAME:
case ProblemRules::RULE_PKG_CONFLICTS:
case ProblemRules::RULE_PKG_INSTALLED_CONFLICTS:
case ProblemRules::RULE_PKG_OBSOLETES:
case ProblemRules::RULE_PKG_INSTALLED_OBSOLETES:
case ProblemRules::RULE_PKG_IMPLICIT_OBSOLETES:
case ProblemRules::RULE_PKG_REQUIRES:
case ProblemRules::RULE_PKG_INSTALLED_REQUIRES:
case ProblemRules::RULE_PKG_SELF_CONFLICT:
case ProblemRules::RULE_YUMOBS:
case ProblemRules::RULE_UNKNOWN:
Expand Down
89 changes: 70 additions & 19 deletions libdnf5/base/transaction.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,7 @@ std::vector<std::string> Transaction::get_gpg_signature_problems() const noexcep

void Transaction::Impl::process_solver_problems(rpm::solv::GoalPrivate & solved_goal) {
auto & pool = get_rpm_pool(base);
auto * installed_repo = pool->installed;

libdnf5::rpm::PackageQuery skip_broken(base, libdnf5::sack::ExcludeFlags::APPLY_EXCLUDES, true);
libdnf5::rpm::PackageQuery skip_conflict(base, libdnf5::sack::ExcludeFlags::APPLY_EXCLUDES, true);
Expand All @@ -458,18 +459,25 @@ void Transaction::Impl::process_solver_problems(rpm::solv::GoalPrivate & solved_
solver_problems.clear();

for (auto & problem : goal_solver_problems) {
std::set<std::pair<int, int>> current_conflicting_rules;
std::vector<std::pair<ProblemRules, std::vector<std::string>>> problem_output;

for (auto & [rule, source, dep, target, description] : problem) {
std::vector<std::string> elements;
ProblemRules tmp_rule = rule;
bool installed_conflicts = false;
switch (rule) {
case ProblemRules::RULE_DISTUPGRADE:
case ProblemRules::RULE_INFARCH:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_2:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_3: {
auto * src_solvable = pool.id2solvable(source);
elements.push_back(pool.solvable2str(src_solvable));
elements.push_back(src_solvable->repo->name);
break;
}
case ProblemRules::RULE_DISTUPGRADE:
case ProblemRules::RULE_UPDATE:
case ProblemRules::RULE_BEST_1:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_2:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_3:
elements.push_back(pool.solvid2str(source));
break;
case ProblemRules::RULE_JOB:
Expand All @@ -483,47 +491,90 @@ void Transaction::Impl::process_solver_problems(rpm::solv::GoalPrivate & solved_
elements.push_back(pool.dep2str(dep));
break;
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_1:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_4:
case ProblemRules::RULE_PKG_NOT_INSTALLABLE_4: {
if (false) {
// TODO (jmracek) (modularExclude && modularExclude->has(source))
} else {
tmp_rule = ProblemRules::RULE_PKG_NOT_INSTALLABLE_4;
}
elements.push_back(pool.solvid2str(source));
auto * src_solvable = pool.id2solvable(source);
elements.push_back(pool.solvable2str(src_solvable));
elements.push_back(src_solvable->repo->name);
break;
case ProblemRules::RULE_PKG_SELF_CONFLICT:
}
case ProblemRules::RULE_PKG_SELF_CONFLICT: {
skip_conflict.add(libdnf5::rpm::Package(base, libdnf5::rpm::PackageId(source)));
auto * src_solvable = pool.id2solvable(source);
elements.push_back(pool.solvable2str(src_solvable));
elements.push_back(src_solvable->repo->name);
elements.push_back(pool.dep2str(dep));
break;
}
case ProblemRules::RULE_PKG_INSTALLED_REQUIRES:
elements.push_back(pool.dep2str(dep));
elements.push_back(pool.solvid2str(source));
break;
case ProblemRules::RULE_PKG_NOTHING_PROVIDES_DEP:
case ProblemRules::RULE_PKG_REQUIRES:
case ProblemRules::RULE_PKG_REQUIRES: {
skip_broken.add(libdnf5::rpm::Package(base, libdnf5::rpm::PackageId(source)));
auto * src_solvable = pool.id2solvable(source);
elements.push_back(pool.dep2str(dep));
elements.push_back(pool.solvid2str(source));
elements.push_back(pool.solvable2str(src_solvable));
elements.push_back(src_solvable->repo->name);
break;
case ProblemRules::RULE_PKG_SAME_NAME:
}
case ProblemRules::RULE_PKG_SAME_NAME: {
skip_conflict.add(libdnf5::rpm::Package(base, libdnf5::rpm::PackageId(source)));
skip_conflict.add(libdnf5::rpm::Package(base, libdnf5::rpm::PackageId(target)));
elements.push_back(pool.solvid2str(source));
elements.push_back(pool.solvid2str(target));
std::sort(elements.begin(), elements.end());
auto * src_solvable = pool.id2solvable(source);
elements.push_back(pool.solvable2str(src_solvable));
elements.push_back(src_solvable->repo->name);
auto * tgt_solvable = pool.id2solvable(target);
elements.push_back(pool.solvable2str(tgt_solvable));
elements.push_back(tgt_solvable->repo->name);
break;
}
case ProblemRules::RULE_PKG_INSTALLED_CONFLICTS:
installed_conflicts = true;
[[fallthrough]];
case ProblemRules::RULE_PKG_CONFLICTS:
if (current_conflicting_rules.contains(std::pair<int, int>(target, source))) {
// do not add pkgA conflicts with pkgB rule if pkgB conflicts with PkgA rule is already present
continue;
}
skip_conflict.add(libdnf5::rpm::Package(base, libdnf5::rpm::PackageId(source)));
skip_conflict.add(libdnf5::rpm::Package(base, libdnf5::rpm::PackageId(target)));
elements.push_back(pool.solvid2str(source));
elements.push_back(pool.dep2str(dep));
elements.push_back(pool.solvid2str(target));
break;
current_conflicting_rules.emplace(source, target);
if (installed_conflicts) {
// RULE_PKG_INSTALLED_CONFLICTS expects the first(source)
// element to be an installed package
if (pool.id2solvable(source)->repo != installed_repo) {
std::swap(source, target);
}
}
[[fallthrough]];
case ProblemRules::RULE_PKG_OBSOLETES:
case ProblemRules::RULE_PKG_INSTALLED_OBSOLETES:
case ProblemRules::RULE_PKG_IMPLICIT_OBSOLETES:
case ProblemRules::RULE_YUMOBS:
case ProblemRules::RULE_YUMOBS: {
auto * src_solvable = pool.id2solvable(source);
elements.push_back(pool.solvable2str(src_solvable));
if (!installed_conflicts) {
elements.push_back(src_solvable->repo->name);
}
elements.push_back(pool.dep2str(dep));
auto * tgt_solvable = pool.id2solvable(target);
elements.push_back(pool.solvable2str(tgt_solvable));
elements.push_back(tgt_solvable->repo->name);
break;
}
case ProblemRules::RULE_PKG_INSTALLED_OBSOLETES: {
elements.push_back(pool.solvid2str(source));
elements.push_back(pool.dep2str(dep));
elements.push_back(pool.solvid2str(target));
auto * tgt_solvable = pool.id2solvable(target);
elements.push_back(pool.solvable2str(tgt_solvable));
elements.push_back(tgt_solvable->repo->name);
break;
}
case ProblemRules::RULE_UNKNOWN:
elements.push_back(description);
break;
Expand Down
Loading
Loading