|
 |
2e24b4 |
From ce301450c39ebbd9fc5ec0897af2df766015e1bd Mon Sep 17 00:00:00 2001
|
|
|
2e24b4 |
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
|
|
2e24b4 |
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
|
|
2e24b4 |
Subject: [PATCH 05/19] Revert "Report a new type of the module resolve error"
|
|
|
2e24b4 |
|
|
|
2e24b4 |
This reverts commit 9235436672fa413d5ac94f52a534b5abe90b5c7f.
|
|
|
2e24b4 |
---
|
|
|
2e24b4 |
libdnf/dnf-context.cpp | 4 ----
|
|
|
2e24b4 |
libdnf/module/ModulePackageContainer.cpp | 17 ++++++++++++-----
|
|
|
2e24b4 |
libdnf/module/ModulePackageContainer.hpp | 10 ++++------
|
|
|
2e24b4 |
3 files changed, 16 insertions(+), 15 deletions(-)
|
|
|
2e24b4 |
|
|
|
2e24b4 |
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
|
|
2e24b4 |
index ccb6fe83..55af2b26 100644
|
|
|
2e24b4 |
--- a/libdnf/dnf-context.cpp
|
|
|
2e24b4 |
+++ b/libdnf/dnf-context.cpp
|
|
|
2e24b4 |
@@ -3252,10 +3252,6 @@ report_problems(const std::vector
|
|
|
2e24b4 |
case libdnf::ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS:
|
|
|
2e24b4 |
logger->warning(tfm::format(_("Modular dependency problem with Defaults: %s"), report.c_str()));
|
|
|
2e24b4 |
break;
|
|
|
2e24b4 |
- case libdnf::ModulePackageContainer::ModuleErrorType::ERROR_IN_LATEST:
|
|
|
2e24b4 |
- logger->warning(tfm::format(_("Modular dependency problem with the lates modules: %s"),
|
|
|
2e24b4 |
- report.c_str()));
|
|
|
2e24b4 |
- break;
|
|
|
2e24b4 |
case libdnf::ModulePackageContainer::ModuleErrorType::ERROR:
|
|
|
2e24b4 |
logger->error(tfm::format(_("Modular dependency problem: %s"), report.c_str()));
|
|
|
2e24b4 |
return_error = true;
|
|
|
2e24b4 |
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
|
|
2e24b4 |
index 1bfdd8c1..ee90056c 100644
|
|
|
2e24b4 |
--- a/libdnf/module/ModulePackageContainer.cpp
|
|
|
2e24b4 |
+++ b/libdnf/module/ModulePackageContainer.cpp
|
|
|
2e24b4 |
@@ -725,16 +725,23 @@ ModulePackageContainer::Impl::moduleSolve(const std::vector<ModulePackage *> & m
|
|
|
2e24b4 |
goal2name_query(goalWeak, query);
|
|
|
2e24b4 |
activatedModules.reset(new PackageSet(*query.runSet()));
|
|
|
2e24b4 |
}
|
|
|
2e24b4 |
- return make_pair(problems, problemType);
|
|
|
2e24b4 |
+ } else {
|
|
|
2e24b4 |
+ problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS;
|
|
|
2e24b4 |
+ Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
|
|
2e24b4 |
+ goal2name_query(goal, query);
|
|
|
2e24b4 |
+ activatedModules.reset(new PackageSet(*query.runSet()));
|
|
|
2e24b4 |
}
|
|
|
2e24b4 |
- problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_LATEST;
|
|
|
2e24b4 |
} else {
|
|
|
2e24b4 |
problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS;
|
|
|
2e24b4 |
+ Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
|
|
2e24b4 |
+ goal2name_query(goal, query);
|
|
|
2e24b4 |
+ activatedModules.reset(new PackageSet(*query.runSet()));
|
|
|
2e24b4 |
}
|
|
|
2e24b4 |
+ } else {
|
|
|
2e24b4 |
+ Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
|
|
2e24b4 |
+ goal2name_query(goal, query);
|
|
|
2e24b4 |
+ activatedModules.reset(new PackageSet(*query.runSet()));
|
|
|
2e24b4 |
}
|
|
|
2e24b4 |
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
|
|
2e24b4 |
- goal2name_query(goal, query);
|
|
|
2e24b4 |
- activatedModules.reset(new PackageSet(*query.runSet()));
|
|
|
2e24b4 |
return make_pair(problems, problemType);
|
|
|
2e24b4 |
}
|
|
|
2e24b4 |
|
|
|
2e24b4 |
diff --git a/libdnf/module/ModulePackageContainer.hpp b/libdnf/module/ModulePackageContainer.hpp
|
|
|
2e24b4 |
index f19c60fd..99fc0677 100644
|
|
|
2e24b4 |
--- a/libdnf/module/ModulePackageContainer.hpp
|
|
|
2e24b4 |
+++ b/libdnf/module/ModulePackageContainer.hpp
|
|
|
2e24b4 |
@@ -48,17 +48,15 @@ public:
|
|
|
2e24b4 |
enum class ModuleErrorType {
|
|
|
2e24b4 |
NO_ERROR = 0,
|
|
|
2e24b4 |
INFO,
|
|
|
2e24b4 |
- /// Error in module defaults detected during resolvement of module dependencies
|
|
|
2e24b4 |
+ /// Error in module defaults detected during resovement of module dependencies
|
|
|
2e24b4 |
ERROR_IN_DEFAULTS,
|
|
|
2e24b4 |
- /// Error detected during resolvement of module dependencies
|
|
|
2e24b4 |
+ /// Error detected during resovement of module dependencies
|
|
|
2e24b4 |
ERROR,
|
|
|
2e24b4 |
- /// Error detected during resolvement of module dependencies - Unexpected error!!!
|
|
|
2e24b4 |
+ /// Error detected during resovement of module dependencies - Unexpected error!!!
|
|
|
2e24b4 |
CANNOT_RESOLVE_MODULES,
|
|
|
2e24b4 |
CANNOT_RESOLVE_MODULE_SPEC,
|
|
|
2e24b4 |
CANNOT_ENABLE_MULTIPLE_STREAMS,
|
|
|
2e24b4 |
- CANNOT_MODIFY_MULTIPLE_TIMES_MODULE_STATE,
|
|
|
2e24b4 |
- /// Problem with latest modules during resolvement of module dependencies
|
|
|
2e24b4 |
- ERROR_IN_LATEST
|
|
|
2e24b4 |
+ CANNOT_MODIFY_MULTIPLE_TIMES_MODULE_STATE
|
|
|
2e24b4 |
};
|
|
|
2e24b4 |
|
|
|
2e24b4 |
struct Exception : public std::runtime_error
|
|
|
2e24b4 |
--
|
|
|
2e24b4 |
2.31.1
|
|
|
2e24b4 |
|