Compare commits
No commits in common. 'c8' and 'c9' have entirely different histories.
@ -1 +1 @@
|
||||
SOURCES/libdnf-0.63.0.tar.gz
|
||||
SOURCES/libdnf-0.69.0.tar.gz
|
||||
|
||||
@ -1 +1 @@
|
||||
5bb88aae1c1b8c104e34916c7509b04fcf7b4de9 SOURCES/libdnf-0.63.0.tar.gz
|
||||
744fc8ba2ad6906c87fc6d91cb953735d1f285e2 SOURCES/libdnf-0.69.0.tar.gz
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 293e10c58dadc023070f959b08999b6bc2efb1b2 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:51 +0200
|
||||
Subject: [PATCH 01/19] Revert "Improve performance for module query"
|
||||
|
||||
This reverts commit 38942d42b6980216e5d5e2e5798664cd08deb3ba.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 8 +++-----
|
||||
1 file changed, 3 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 1d5070ca..edb7e9ec 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -775,11 +775,9 @@ ModulePackageContainer::query(std::string name, std::string stream, std::string
|
||||
Query query(pImpl->moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
// platform modules are installed and not in modules std::Map.
|
||||
query.available();
|
||||
- if (!name.empty() || !stream.empty()) {
|
||||
- std::ostringstream ss;
|
||||
- ss << stringFormater(name) << ":" << stringFormater(stream);
|
||||
- query.addFilter(HY_PKG_DESCRIPTION, HY_GLOB, ss.str().c_str());
|
||||
- }
|
||||
+ std::ostringstream ss;
|
||||
+ ss << stringFormater(name) << ":" << stringFormater(stream);
|
||||
+ query.addFilter(HY_PKG_DESCRIPTION, HY_GLOB, ss.str().c_str());
|
||||
if (!context.empty()) {
|
||||
query.addFilter(HY_PKG_SUMMARY, HY_GLOB, context.c_str());
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From fe466856f54ed2cd261a863b2c929a064ae5e945 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:51 +0200
|
||||
Subject: [PATCH 02/19] Revert "Enhance description of modular solvables"
|
||||
|
||||
This reverts commit 943d9a1ba905f2e10975b16edff0684964c135b6.
|
||||
---
|
||||
libdnf/module/ModulePackage.cpp | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
|
||||
index 3757f6ad..d0017877 100644
|
||||
--- a/libdnf/module/ModulePackage.cpp
|
||||
+++ b/libdnf/module/ModulePackage.cpp
|
||||
@@ -50,8 +50,6 @@ namespace libdnf {
|
||||
* Arch: $arch (If arch is not defined, set "noarch")
|
||||
* Provides: module($name)
|
||||
* Provides: module($name:$stream)
|
||||
- * Summary: original_context
|
||||
- * Description: name:stream
|
||||
*/
|
||||
static void setSovable(Pool * pool, Solvable * solvable, const std::string & name,
|
||||
const std::string & stream, const std::string & version, const std::string & context, const char * arch, const std::string & original_context)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From adf159cce65fa5b15f81dd3ee319e551f01def1a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:51 +0200
|
||||
Subject: [PATCH 03/19] Revert "Fix typo: lates -> latest"
|
||||
|
||||
This reverts commit 2a7a315cda61355d60fc0dd0fae9ccd48079a9c5.
|
||||
---
|
||||
libdnf/dnf-context.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
||||
index 926681c2..ccb6fe83 100644
|
||||
--- a/libdnf/dnf-context.cpp
|
||||
+++ b/libdnf/dnf-context.cpp
|
||||
@@ -3253,7 +3253,7 @@ report_problems(const std::vector<std::tuple<libdnf::ModulePackageContainer::Mod
|
||||
logger->warning(tfm::format(_("Modular dependency problem with Defaults: %s"), report.c_str()));
|
||||
break;
|
||||
case libdnf::ModulePackageContainer::ModuleErrorType::ERROR_IN_LATEST:
|
||||
- logger->warning(tfm::format(_("Modular dependency problem with the latest modules: %s"),
|
||||
+ logger->warning(tfm::format(_("Modular dependency problem with the lates modules: %s"),
|
||||
report.c_str()));
|
||||
break;
|
||||
case libdnf::ModulePackageContainer::ModuleErrorType::ERROR:
|
||||
--
|
||||
2.31.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,39 +0,0 @@
|
||||
From 291f0393b54b31228c7a4c8c112003b64632967b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:52 +0200
|
||||
Subject: [PATCH 04/19] Revert "Remove unused code bump version"
|
||||
|
||||
This reverts commit f0fde46c42f2424135617b29fdfbcbf9e17fc79a.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 15 +++++++++++++++
|
||||
1 file changed, 15 insertions(+)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index edb7e9ec..1bfdd8c1 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -1014,6 +1014,21 @@ modulePackageLatestPerRepoSorter(DnfSack * sack, const ModulePackage * first, co
|
||||
return first->getVersionNum() > second->getVersionNum();
|
||||
}
|
||||
|
||||
+static bool
|
||||
+modulePackageLatestSorter(DnfSack * sack, const ModulePackage * first, const ModulePackage * second)
|
||||
+{
|
||||
+ int cmp = g_strcmp0(first->getNameCStr(), second->getNameCStr());
|
||||
+ if (cmp != 0)
|
||||
+ return cmp < 0;
|
||||
+ cmp = dnf_sack_evr_cmp(sack, first->getStreamCStr(), second->getStreamCStr());
|
||||
+ if (cmp != 0)
|
||||
+ return cmp < 0;
|
||||
+ cmp = g_strcmp0(first->getArchCStr(), second->getArchCStr());
|
||||
+ if (cmp != 0)
|
||||
+ return cmp < 0;
|
||||
+ return first->getVersionNum() > second->getVersionNum();
|
||||
+}
|
||||
+
|
||||
std::vector<std::vector<std::vector<ModulePackage *>>>
|
||||
ModulePackageContainer::getLatestModulesPerRepo(ModuleState moduleFilter,
|
||||
std::vector<ModulePackage *> modulePackages)
|
||||
--
|
||||
2.31.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,89 +0,0 @@
|
||||
From ce301450c39ebbd9fc5ec0897af2df766015e1bd Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 05/19] Revert "Report a new type of the module resolve error"
|
||||
|
||||
This reverts commit 9235436672fa413d5ac94f52a534b5abe90b5c7f.
|
||||
---
|
||||
libdnf/dnf-context.cpp | 4 ----
|
||||
libdnf/module/ModulePackageContainer.cpp | 17 ++++++++++++-----
|
||||
libdnf/module/ModulePackageContainer.hpp | 10 ++++------
|
||||
3 files changed, 16 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
||||
index ccb6fe83..55af2b26 100644
|
||||
--- a/libdnf/dnf-context.cpp
|
||||
+++ b/libdnf/dnf-context.cpp
|
||||
@@ -3252,10 +3252,6 @@ report_problems(const std::vector<std::tuple<libdnf::ModulePackageContainer::Mod
|
||||
case libdnf::ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS:
|
||||
logger->warning(tfm::format(_("Modular dependency problem with Defaults: %s"), report.c_str()));
|
||||
break;
|
||||
- case libdnf::ModulePackageContainer::ModuleErrorType::ERROR_IN_LATEST:
|
||||
- logger->warning(tfm::format(_("Modular dependency problem with the lates modules: %s"),
|
||||
- report.c_str()));
|
||||
- break;
|
||||
case libdnf::ModulePackageContainer::ModuleErrorType::ERROR:
|
||||
logger->error(tfm::format(_("Modular dependency problem: %s"), report.c_str()));
|
||||
return_error = true;
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 1bfdd8c1..ee90056c 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -725,16 +725,23 @@ ModulePackageContainer::Impl::moduleSolve(const std::vector<ModulePackage *> & m
|
||||
goal2name_query(goalWeak, query);
|
||||
activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
}
|
||||
- return make_pair(problems, problemType);
|
||||
+ } else {
|
||||
+ problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS;
|
||||
+ Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
+ goal2name_query(goal, query);
|
||||
+ activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
}
|
||||
- problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_LATEST;
|
||||
} else {
|
||||
problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS;
|
||||
+ Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
+ goal2name_query(goal, query);
|
||||
+ activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
}
|
||||
+ } else {
|
||||
+ Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
+ goal2name_query(goal, query);
|
||||
+ activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
}
|
||||
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- goal2name_query(goal, query);
|
||||
- activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
return make_pair(problems, problemType);
|
||||
}
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.hpp b/libdnf/module/ModulePackageContainer.hpp
|
||||
index f19c60fd..99fc0677 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.hpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.hpp
|
||||
@@ -48,17 +48,15 @@ public:
|
||||
enum class ModuleErrorType {
|
||||
NO_ERROR = 0,
|
||||
INFO,
|
||||
- /// Error in module defaults detected during resolvement of module dependencies
|
||||
+ /// Error in module defaults detected during resovement of module dependencies
|
||||
ERROR_IN_DEFAULTS,
|
||||
- /// Error detected during resolvement of module dependencies
|
||||
+ /// Error detected during resovement of module dependencies
|
||||
ERROR,
|
||||
- /// Error detected during resolvement of module dependencies - Unexpected error!!!
|
||||
+ /// Error detected during resovement of module dependencies - Unexpected error!!!
|
||||
CANNOT_RESOLVE_MODULES,
|
||||
CANNOT_RESOLVE_MODULE_SPEC,
|
||||
CANNOT_ENABLE_MULTIPLE_STREAMS,
|
||||
- CANNOT_MODIFY_MULTIPLE_TIMES_MODULE_STATE,
|
||||
- /// Problem with latest modules during resolvement of module dependencies
|
||||
- ERROR_IN_LATEST
|
||||
+ CANNOT_MODIFY_MULTIPLE_TIMES_MODULE_STATE
|
||||
};
|
||||
|
||||
struct Exception : public std::runtime_error
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d138dbf60588b73a8ee9499540c82a8950ba9432 Mon Sep 17 00:00:00 2001
|
||||
From ccd66a3cb4ddb7a0f0d914ee06eed58121dbe7ce Mon Sep 17 00:00:00 2001
|
||||
From: Aleš Matěj <amatej@redhat.com>
|
||||
Date: Tue, 27 Jun 2023 07:24:28 +0200
|
||||
Subject: [PATCH] filterAdvisory: match installed_solvables sort with lower_bound (RhBug:2212838)
|
||||
@ -1,62 +0,0 @@
|
||||
From 15a06ef27466f42a8dc39823385f0ca655e80b12 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 06/19] Revert "Add additional fallback for module resolve"
|
||||
|
||||
This reverts commit fc98ce725181a77bbe0ab157d40443467612c0c0.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 32 ++++++++----------------
|
||||
1 file changed, 11 insertions(+), 21 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index ee90056c..e19db08b 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -702,33 +702,23 @@ ModulePackageContainer::Impl::moduleSolve(const std::vector<ModulePackage *> & m
|
||||
std::vector<std::vector<std::string>> problems;
|
||||
auto problemType = ModulePackageContainer::ModuleErrorType::NO_ERROR;
|
||||
if (ret) {
|
||||
- // Goal run ignor problem in defaults
|
||||
problems = goal.describeAllProblemRules(false);
|
||||
ret = goal.run(DNF_FORCE_BEST);
|
||||
if (ret) {
|
||||
- // Goal run ignor problem in defaults and in latest
|
||||
- ret = goal.run(DNF_NONE);
|
||||
+ // Conflicting modules has to be removed otherwice it could result than one of them will
|
||||
+ // be active
|
||||
+ auto conflictingPkgs = goal.listConflictPkgs(DNF_PACKAGE_STATE_AVAILABLE);
|
||||
+ dnf_sack_add_excludes(moduleSack, conflictingPkgs.get());
|
||||
+ ret = goalWeak.run(DNF_NONE);
|
||||
if (ret) {
|
||||
- // Conflicting modules has to be removed otherwice it could result than one of them will
|
||||
- // be active
|
||||
- auto conflictingPkgs = goal.listConflictPkgs(DNF_PACKAGE_STATE_AVAILABLE);
|
||||
- dnf_sack_add_excludes(moduleSack, conflictingPkgs.get());
|
||||
- ret = goalWeak.run(DNF_NONE);
|
||||
- if (ret) {
|
||||
- auto logger(Log::getLogger());
|
||||
- logger->critical("Modularity filtering totally broken\n");
|
||||
- problemType = ModulePackageContainer::ModuleErrorType::CANNOT_RESOLVE_MODULES;
|
||||
- activatedModules.reset();
|
||||
- } else {
|
||||
- problemType = ModulePackageContainer::ModuleErrorType::ERROR;
|
||||
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- goal2name_query(goalWeak, query);
|
||||
- activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
- }
|
||||
+ auto logger(Log::getLogger());
|
||||
+ logger->critical("Modularity filtering totally broken\n");
|
||||
+ problemType = ModulePackageContainer::ModuleErrorType::CANNOT_RESOLVE_MODULES;
|
||||
+ activatedModules.reset();
|
||||
} else {
|
||||
- problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS;
|
||||
+ problemType = ModulePackageContainer::ModuleErrorType::ERROR;
|
||||
Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- goal2name_query(goal, query);
|
||||
+ goal2name_query(goalWeak, query);
|
||||
activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
}
|
||||
} else {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -0,0 +1,84 @@
|
||||
From dadfe65ce753ba8a8bdb5e38d7929135526edbd5 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Blaha <mblaha@redhat.com>
|
||||
Date: Thu, 31 Aug 2023 13:18:03 +0200
|
||||
Subject: [PATCH] hawkey.subject: get_best_selectors only obsoleters of latest
|
||||
|
||||
In situation where a package exists in multiple versions and some older
|
||||
version is being obsoleted, any of obsoleters was considered a valid
|
||||
solution.
|
||||
|
||||
The result could be really misleading. For example let's have this package set:
|
||||
|
||||
systemd-udev-1.0
|
||||
|
||||
systemd-udev-2.0
|
||||
Obsoletes: systemd-udev < 2
|
||||
|
||||
systemd-boot-unsigned-2.0
|
||||
Obsoletes: systemd-udev < 2
|
||||
|
||||
In this case `dnf install systemd-udev` may lead to installation of
|
||||
systemd-boot-unsigned which is probably not what the user expected. The
|
||||
reason is the split in the upgrade-path created by obsolete and both
|
||||
branches - systemd-udev-2.0 and systemd-boot-unsigned-2.0 are considered
|
||||
valid.
|
||||
|
||||
With this patch install command takes into account only obsoleters of
|
||||
the best version of the package so the `dnf install systemd-udev`
|
||||
results in correct installation of systemd-udev-2.0 package.
|
||||
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2183279
|
||||
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2176263
|
||||
---
|
||||
python/hawkey/__init__.py | 17 ++++++++++++++---
|
||||
1 file changed, 14 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/python/hawkey/__init__.py b/python/hawkey/__init__.py
|
||||
index 45bdc3a..1ec1ef4 100644
|
||||
--- a/python/hawkey/__init__.py
|
||||
+++ b/python/hawkey/__init__.py
|
||||
@@ -291,13 +291,13 @@ class Subject(_hawkey.Subject):
|
||||
# after movement of base.install() or base.distro_sync()
|
||||
return []
|
||||
|
||||
+ installed_query = q.installed()
|
||||
if not self._filename_pattern and is_glob_pattern(self.pattern) \
|
||||
or solution['nevra'] and solution['nevra'].name is None:
|
||||
with_obsoletes = False
|
||||
|
||||
if obsoletes and solution['nevra'] and solution['nevra'].has_just_name():
|
||||
with_obsoletes = True
|
||||
- installed_query = q.installed()
|
||||
if reponame:
|
||||
q = q.filter(reponame=reponame)
|
||||
available_query = q.available()
|
||||
@@ -309,13 +309,24 @@ class Subject(_hawkey.Subject):
|
||||
sltrs = []
|
||||
for name, pkgs_list in q._name_dict().items():
|
||||
if with_obsoletes:
|
||||
+ # If there is no installed package in the pkgs_list, add only
|
||||
+ # obsoleters of the latest versions. Otherwise behave consistently
|
||||
+ # with upgrade and add all obsoleters.
|
||||
+ # See https://bugzilla.redhat.com/show_bug.cgi?id=2176263
|
||||
+ # for details of the problem.
|
||||
+ obsoletes_query = base.sack.query().filterm(pkg=pkgs_list)
|
||||
+ if not obsoletes_query.installed():
|
||||
+ obsoletes_query.filterm(latest_per_arch_by_priority=True)
|
||||
pkgs_list = pkgs_list + base.sack.query().filter(
|
||||
- obsoletes=pkgs_list).run()
|
||||
+ obsoletes=obsoletes_query).run()
|
||||
sltrs.append(self._list_or_query_to_selector(base.sack, pkgs_list))
|
||||
return sltrs
|
||||
else:
|
||||
if obsoletes and solution['nevra'] and solution['nevra'].has_just_name():
|
||||
- q = q.union(base.sack.query().filter(obsoletes=q))
|
||||
+ if installed_query:
|
||||
+ q = q.union(base.sack.query().filter(obsoletes=q))
|
||||
+ else:
|
||||
+ q = q.union(base.sack.query().filter(obsoletes=q.filter(latest_per_arch_by_priority=True)))
|
||||
installed_query = q.installed()
|
||||
|
||||
if reports:
|
||||
--
|
||||
libgit2 1.6.4
|
||||
|
||||
@ -1,27 +0,0 @@
|
||||
From 0a92554dc2df3d2241b289bb796bc997c2959aaa Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 07/19] Revert "Decide how to handle context according to
|
||||
static_context value"
|
||||
|
||||
This reverts commit 66439ed5a57373dfd106379637a9400b107e160c.
|
||||
---
|
||||
libdnf/module/modulemd/ModuleMetadata.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdnf/module/modulemd/ModuleMetadata.cpp b/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
index ee6834c6..07817ce1 100644
|
||||
--- a/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
+++ b/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
@@ -142,7 +142,7 @@ std::vector<ModulePackage *> ModuleMetadata::getAllModulePackages(DnfSack * modu
|
||||
//GPtrArray * streams = modulemd_module_index_search_streams_by_nsvca_glob(resultingModuleIndex, NULL);
|
||||
for (unsigned int i = 0; i < streams->len; i++){
|
||||
ModulemdModuleStream * moduleMdStream = static_cast<ModulemdModuleStream *>(g_ptr_array_index(streams, i));
|
||||
- if (modulemd_module_stream_v2_is_static_context((ModulemdModuleStreamV2 *) moduleMdStream)) {
|
||||
+ if (modulemd_module_stream_get_mdversion(moduleMdStream) > 2) {
|
||||
result.push_back(new ModulePackage(moduleSack, repo, moduleMdStream, repoID));
|
||||
} else {
|
||||
g_object_ref(moduleMdStream);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,76 +0,0 @@
|
||||
From 140168ce29d2425ebf2b4b5b25926611a189cd84 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 08/19] Revert "Fix load/update FailSafe"
|
||||
|
||||
This reverts commit 244a37d772fcd5a5969085edab544fb1e7b68aad.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 38 ++++++++++++++++++------
|
||||
1 file changed, 29 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index e19db08b..97c84c01 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -1641,7 +1641,6 @@ ModulePackageContainer::Impl::ModulePersistor::getRemovedProfiles()
|
||||
|
||||
void ModulePackageContainer::loadFailSafeData()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
auto persistor = pImpl->persistor->configs;
|
||||
|
||||
std::map<std::string, std::pair<std::string, bool>> enabledStreams;
|
||||
@@ -1696,21 +1695,42 @@ void ModulePackageContainer::loadFailSafeData()
|
||||
|
||||
std::vector<ModulePackage *> ModulePackageContainer::Impl::getLatestActiveEnabledModules()
|
||||
{
|
||||
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- query.addFilter(HY_PKG, HY_EQ, activatedModules.get());
|
||||
- query.addFilter(HY_PKG_REPONAME, HY_NEQ, HY_SYSTEM_REPO_NAME);
|
||||
- query.addFilter(HY_PKG_LATEST_PER_ARCH, HY_EQ, 1);
|
||||
- auto set = query.runSet();
|
||||
-
|
||||
std::vector<ModulePackage *> activeModules;
|
||||
Id moduleId = -1;
|
||||
- while ((moduleId = set->next(moduleId)) != -1) {
|
||||
+ while ((moduleId = activatedModules->next(moduleId)) != -1) {
|
||||
auto modulePackage = modules.at(moduleId).get();
|
||||
if (isEnabled(modulePackage->getName(), modulePackage->getStream())) {
|
||||
activeModules.push_back(modulePackage);
|
||||
}
|
||||
}
|
||||
- return activeModules;
|
||||
+ if (activeModules.empty()) {
|
||||
+ return {};
|
||||
+ }
|
||||
+ auto sack = moduleSack;
|
||||
+ std::sort(activeModules.begin(), activeModules.end(),
|
||||
+ [sack](const ModulePackage * first, const ModulePackage * second)
|
||||
+ {return modulePackageLatestSorter(sack, first, second);});
|
||||
+
|
||||
+ auto packageFirst = activeModules[0];
|
||||
+ std::vector<ModulePackage *> latest;
|
||||
+ auto vectorSize = activeModules.size();
|
||||
+ latest.push_back(packageFirst);
|
||||
+ auto name = packageFirst->getNameCStr();
|
||||
+ auto stream = packageFirst->getStreamCStr();
|
||||
+ auto arch = packageFirst->getArchCStr();
|
||||
+
|
||||
+ for (unsigned int index = 1; index < vectorSize; ++index) {
|
||||
+ auto & package = activeModules[index];
|
||||
+ if (g_strcmp0(package->getNameCStr(), name) != 0 ||
|
||||
+ g_strcmp0(package->getStreamCStr(), stream) != 0 ||
|
||||
+ g_strcmp0(package->getArchCStr(), arch) != 0) {
|
||||
+ name = package->getNameCStr();
|
||||
+ stream = package->getStreamCStr();
|
||||
+ arch = package->getArchCStr();
|
||||
+ latest.push_back(package);
|
||||
+ }
|
||||
+ }
|
||||
+ return latest;
|
||||
}
|
||||
|
||||
void ModulePackageContainer::Impl::addVersion2Modules()
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,78 +0,0 @@
|
||||
From e43ef244e78d8563eb3cb7ff6a6074946f60c877 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 09/19] Revert "Change mechanism of module conflicts"
|
||||
|
||||
This reverts commit 49600ba05b474bc29651aa122a9116b5ada69f4d.
|
||||
---
|
||||
libdnf/dnf-sack.cpp | 1 +
|
||||
libdnf/module/ModulePackage.cpp | 2 --
|
||||
libdnf/module/ModulePackage.hpp | 1 -
|
||||
libdnf/module/ModulePackageContainer.cpp | 1 -
|
||||
libdnf/module/ModulePackageContainer.hpp | 1 -
|
||||
5 files changed, 1 insertion(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-sack.cpp b/libdnf/dnf-sack.cpp
|
||||
index b5c7edc0..b9baeaef 100644
|
||||
--- a/libdnf/dnf-sack.cpp
|
||||
+++ b/libdnf/dnf-sack.cpp
|
||||
@@ -2297,6 +2297,7 @@ void readModuleMetadataFromRepo(DnfSack * sack, libdnf::ModulePackageContainer *
|
||||
modulePackages->add(sack);
|
||||
modulePackages->loadFailSafeData();
|
||||
if (!modulePackages->empty()) {
|
||||
+ modulePackages->createConflictsBetweenStreams();
|
||||
// TODO remove hard-coded path
|
||||
try {
|
||||
std::vector<std::string> paths{"/etc/os-release", "/usr/lib/os-release"};
|
||||
diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
|
||||
index d0017877..d644eca6 100644
|
||||
--- a/libdnf/module/ModulePackage.cpp
|
||||
+++ b/libdnf/module/ModulePackage.cpp
|
||||
@@ -75,8 +75,6 @@ static void setSovable(Pool * pool, Solvable * solvable, const std::string & nam
|
||||
ss << "module(" << name << ")";
|
||||
auto depId = pool_str2id(pool, ss.str().c_str(), 1);
|
||||
solvable_add_deparray(solvable, SOLVABLE_PROVIDES, depId, -1);
|
||||
- // create Conflicts: module($name)
|
||||
- solvable_add_deparray(solvable, SOLVABLE_CONFLICTS, depId, 0);
|
||||
|
||||
// create Provide: module($name:$stream)
|
||||
ss.str(std::string());
|
||||
diff --git a/libdnf/module/ModulePackage.hpp b/libdnf/module/ModulePackage.hpp
|
||||
index b618df58..145c6d63 100644
|
||||
--- a/libdnf/module/ModulePackage.hpp
|
||||
+++ b/libdnf/module/ModulePackage.hpp
|
||||
@@ -71,7 +71,6 @@ public:
|
||||
|
||||
std::vector<ModuleDependencies> getModuleDependencies() const;
|
||||
|
||||
- ///DEPRECATED
|
||||
void addStreamConflict(const ModulePackage * package);
|
||||
|
||||
Id getId() const { return id; };
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 97c84c01..893b839a 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -204,7 +204,6 @@ private:
|
||||
/// solvable.arch = <moduleArch>
|
||||
/// solvable.summary = <moduleContext>
|
||||
/// solvable.description = <moduleName>:<moduleStream>
|
||||
- /// solvable.conflicts = module(<moduleName>)
|
||||
DnfSack * moduleSack;
|
||||
std::unique_ptr<PackageSet> activatedModules;
|
||||
std::string installRoot;
|
||||
diff --git a/libdnf/module/ModulePackageContainer.hpp b/libdnf/module/ModulePackageContainer.hpp
|
||||
index 99fc0677..c1001fce 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.hpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.hpp
|
||||
@@ -115,7 +115,6 @@ public:
|
||||
Id addPlatformPackage(const std::string &osReleasePath, const char * platformModule);
|
||||
Id addPlatformPackage(DnfSack * sack,
|
||||
const std::vector<std::string> & osReleasePath, const char * platformModule);
|
||||
- /// DEPRECATED
|
||||
void createConflictsBetweenStreams();
|
||||
|
||||
/**
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,214 +0,0 @@
|
||||
From 058b6112374f5feb5ee57488ac3fdbc7666a2016 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 10/19] Revert "Call addVersion2Modules(); as late as possible"
|
||||
|
||||
This reverts commit fe27dba67384e549a3be2a91c4a6cf1151113157.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 28 +++---------------------
|
||||
1 file changed, 3 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 893b839a..6ee2b68f 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -346,6 +346,7 @@ ModulePackageContainer::add(DnfSack * sack)
|
||||
exception.what()));
|
||||
}
|
||||
}
|
||||
+ pImpl->addVersion2Modules();
|
||||
}
|
||||
|
||||
void ModulePackageContainer::addDefaultsFromDisk()
|
||||
@@ -427,7 +428,6 @@ void ModulePackageContainer::createConflictsBetweenStreams()
|
||||
|
||||
bool ModulePackageContainer::empty() const noexcept
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->modules.empty();
|
||||
}
|
||||
|
||||
@@ -521,13 +521,11 @@ bool ModulePackageContainer::isDisabled(const ModulePackage * module)
|
||||
std::vector<std::string> ModulePackageContainer::getDefaultProfiles(std::string moduleName,
|
||||
std::string moduleStream)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->moduleMetadata.getDefaultProfiles(moduleName, moduleStream);
|
||||
}
|
||||
|
||||
const std::string & ModulePackageContainer::getDefaultStream(const std::string &name) const
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
auto it = pImpl->moduleDefaults.find(name);
|
||||
if (it == pImpl->moduleDefaults.end()) {
|
||||
return EMPTY_RESULT;
|
||||
@@ -537,7 +535,6 @@ const std::string & ModulePackageContainer::getDefaultStream(const std::string &
|
||||
|
||||
const std::string & ModulePackageContainer::getEnabledStream(const std::string &name)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getStream(name);
|
||||
}
|
||||
|
||||
@@ -547,7 +544,6 @@ const std::string & ModulePackageContainer::getEnabledStream(const std::string &
|
||||
bool
|
||||
ModulePackageContainer::enable(const std::string &name, const std::string & stream, const bool count)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
if (count) {
|
||||
pImpl->persistor->getEntry(name).second.streamChangesNum++;
|
||||
}
|
||||
@@ -573,7 +569,6 @@ ModulePackageContainer::enable(const ModulePackage * module, const bool count)
|
||||
*/
|
||||
void ModulePackageContainer::disable(const std::string & name, const bool count)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
if (count) {
|
||||
pImpl->persistor->getEntry(name).second.streamChangesNum++;
|
||||
}
|
||||
@@ -594,11 +589,11 @@ void ModulePackageContainer::disable(const ModulePackage * module, const bool co
|
||||
*/
|
||||
void ModulePackageContainer::reset(const std::string & name, const bool count)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
if (count) {
|
||||
pImpl->persistor->getEntry(name).second.streamChangesNum++;
|
||||
}
|
||||
pImpl->persistor->changeState(name, ModuleState::UNKNOWN);
|
||||
+
|
||||
pImpl->persistor->changeStream(name, "");
|
||||
auto & profiles = pImpl->persistor->getEntry(name).second.profiles;
|
||||
profiles.clear();
|
||||
@@ -638,7 +633,6 @@ bool ModulePackageContainer::isChanged()
|
||||
void ModulePackageContainer::install(const std::string &name, const std::string &stream,
|
||||
const std::string &profile)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
for (const auto &iter : pImpl->modules) {
|
||||
auto modulePackage = iter.second.get();
|
||||
if (modulePackage->getName() == name && modulePackage->getStream() == stream) {
|
||||
@@ -656,7 +650,6 @@ void ModulePackageContainer::install(const ModulePackage * module, const std::st
|
||||
void ModulePackageContainer::uninstall(const std::string &name, const std::string &stream,
|
||||
const std::string &profile)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
for (const auto &iter : pImpl->modules) {
|
||||
auto modulePackage = iter.second.get();
|
||||
if (modulePackage->getName() == name && modulePackage->getStream() == stream) {
|
||||
@@ -744,7 +737,6 @@ ModulePackageContainer::query(Nsvcap& moduleNevra)
|
||||
std::vector<ModulePackage *>
|
||||
ModulePackageContainer::query(std::string subject)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
// Alternatively a search using module provides could be performed
|
||||
std::vector<ModulePackage *> result;
|
||||
Query query(pImpl->moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
@@ -765,7 +757,6 @@ std::vector<ModulePackage *>
|
||||
ModulePackageContainer::query(std::string name, std::string stream, std::string version,
|
||||
std::string context, std::string arch)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
// Alternatively a search using module provides could be performed
|
||||
std::vector<ModulePackage *> result;
|
||||
Query query(pImpl->moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
@@ -847,7 +838,6 @@ ModulePackageContainer::getModuleState(const std::string& name)
|
||||
|
||||
std::set<std::string> ModulePackageContainer::getInstalledPkgNames()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
auto moduleNames = pImpl->persistor->getAllModuleNames();
|
||||
std::set<std::string> pkgNames;
|
||||
for (auto & moduleName: moduleNames) {
|
||||
@@ -1029,7 +1019,6 @@ std::vector<std::vector<std::vector<ModulePackage *>>>
|
||||
ModulePackageContainer::getLatestModulesPerRepo(ModuleState moduleFilter,
|
||||
std::vector<ModulePackage *> modulePackages)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
if (modulePackages.empty()) {
|
||||
return {};
|
||||
}
|
||||
@@ -1113,7 +1102,6 @@ ModulePackageContainer::getLatestModulesPerRepo(ModuleState moduleFilter,
|
||||
std::pair<std::vector<std::vector<std::string>>, ModulePackageContainer::ModuleErrorType>
|
||||
ModulePackageContainer::resolveActiveModulePackages(bool debugSolver)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
dnf_sack_reset_excludes(pImpl->moduleSack);
|
||||
std::vector<ModulePackage *> packages;
|
||||
|
||||
@@ -1164,7 +1152,6 @@ bool ModulePackageContainer::isModuleActive(const ModulePackage * modulePackage)
|
||||
|
||||
std::vector<ModulePackage *> ModulePackageContainer::getModulePackages()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
std::vector<ModulePackage *> values;
|
||||
const auto & modules = pImpl->modules;
|
||||
std::transform(
|
||||
@@ -1186,56 +1173,47 @@ void ModulePackageContainer::rollback()
|
||||
|
||||
std::map<std::string, std::string> ModulePackageContainer::getEnabledStreams()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getEnabledStreams();
|
||||
}
|
||||
|
||||
std::vector<std::string> ModulePackageContainer::getDisabledModules()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getDisabledModules();
|
||||
}
|
||||
|
||||
std::map<std::string, std::string> ModulePackageContainer::getDisabledStreams()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getDisabledStreams();
|
||||
}
|
||||
|
||||
std::vector<std::string> ModulePackageContainer::getResetModules()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getResetModules();
|
||||
}
|
||||
|
||||
std::map<std::string, std::string> ModulePackageContainer::getResetStreams()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getResetStreams();
|
||||
}
|
||||
|
||||
std::map<std::string, std::pair<std::string, std::string>>
|
||||
ModulePackageContainer::getSwitchedStreams()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getSwitchedStreams();
|
||||
}
|
||||
|
||||
std::map<std::string, std::vector<std::string>> ModulePackageContainer::getInstalledProfiles()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getInstalledProfiles();
|
||||
}
|
||||
|
||||
std::vector<std::string> ModulePackageContainer::getInstalledProfiles(std::string moduleName)
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getProfiles(moduleName);
|
||||
}
|
||||
|
||||
std::map<std::string, std::vector<std::string>> ModulePackageContainer::getRemovedProfiles()
|
||||
{
|
||||
- pImpl->addVersion2Modules();
|
||||
return pImpl->persistor->getRemovedProfiles();
|
||||
}
|
||||
const std::string &
|
||||
@@ -1641,7 +1619,7 @@ ModulePackageContainer::Impl::ModulePersistor::getRemovedProfiles()
|
||||
void ModulePackageContainer::loadFailSafeData()
|
||||
{
|
||||
auto persistor = pImpl->persistor->configs;
|
||||
-
|
||||
+
|
||||
std::map<std::string, std::pair<std::string, bool>> enabledStreams;
|
||||
for (auto & nameConfig: persistor) {
|
||||
if (nameConfig.second.second.state == ModuleState::ENABLED) {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,108 +0,0 @@
|
||||
From 83703689de978cbb5e38f04fb1d9f554026de5ba Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 11/19] Revert "Fix modular queries with the new solver"
|
||||
|
||||
This reverts commit a9f99a4969831f5d0e21d0f2b2b088ff6546604b.
|
||||
---
|
||||
libdnf/module/ModulePackage.cpp | 17 ++++-------------
|
||||
libdnf/module/ModulePackageContainer.cpp | 13 ++-----------
|
||||
libdnf/module/ModulePackageContainer.hpp | 2 +-
|
||||
3 files changed, 7 insertions(+), 25 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
|
||||
index d644eca6..63ee1656 100644
|
||||
--- a/libdnf/module/ModulePackage.cpp
|
||||
+++ b/libdnf/module/ModulePackage.cpp
|
||||
@@ -52,7 +52,7 @@ namespace libdnf {
|
||||
* Provides: module($name:$stream)
|
||||
*/
|
||||
static void setSovable(Pool * pool, Solvable * solvable, const std::string & name,
|
||||
- const std::string & stream, const std::string & version, const std::string & context, const char * arch, const std::string & original_context)
|
||||
+ const std::string & stream, const std::string & version, const std::string & context, const char * arch)
|
||||
{
|
||||
std::ostringstream ss;
|
||||
// Name: $name:$stream:$context
|
||||
@@ -62,14 +62,6 @@ static void setSovable(Pool * pool, Solvable * solvable, const std::string & nam
|
||||
// TODO Test can be remove when modules will be always with arch
|
||||
solvable_set_str(solvable, SOLVABLE_ARCH, arch ? arch : "noarch");
|
||||
|
||||
- // store original context in summary
|
||||
- solvable_set_str(solvable, SOLVABLE_SUMMARY, original_context.c_str());
|
||||
-
|
||||
- // store original name:stream in description
|
||||
- ss.str(std::string());
|
||||
- ss << name << ":" << stream;
|
||||
- solvable_set_str(solvable, SOLVABLE_DESCRIPTION, ss.str().c_str());
|
||||
-
|
||||
// create Provide: module($name)
|
||||
ss.str(std::string());
|
||||
ss << "module(" << name << ")";
|
||||
@@ -105,9 +97,8 @@ ModulePackage::ModulePackage(DnfSack * moduleSack, LibsolvRepo * repo,
|
||||
Pool * pool = dnf_sack_get_pool(moduleSack);
|
||||
id = repo_add_solvable(repo);
|
||||
Solvable *solvable = pool_id2solvable(pool, id);
|
||||
- std::string original_context = getContext();
|
||||
- setSovable(pool, solvable, getName(), getStream(), getVersion(), context.empty() ? original_context : context,
|
||||
- getArchCStr(), original_context);
|
||||
+
|
||||
+ setSovable(pool, solvable, getName(), getStream(), getVersion(), context.empty() ? getContext() : context, getArchCStr());
|
||||
createDependencies(solvable);
|
||||
HyRepo hyRepo = static_cast<HyRepo>(repo->appdata);
|
||||
libdnf::repoGetImpl(hyRepo)->needs_internalizing = 1;
|
||||
@@ -649,7 +640,7 @@ ModulePackage::createPlatformSolvable(DnfSack * sack, DnfSack * moduleSack,
|
||||
repoImpl->needs_internalizing = 1;
|
||||
Id id = repo_add_solvable(repo);
|
||||
Solvable *solvable = pool_id2solvable(pool, id);
|
||||
- setSovable(pool, solvable, name, stream, version, context, "noarch", context);
|
||||
+ setSovable(pool, solvable, name, stream, version, context, "noarch");
|
||||
repoImpl->needs_internalizing = 1;
|
||||
dnf_sack_set_provides_not_ready(moduleSack);
|
||||
dnf_sack_set_considered_to_update(moduleSack);
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 6ee2b68f..3f30037e 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -197,13 +197,6 @@ private:
|
||||
class ModulePersistor;
|
||||
std::unique_ptr<ModulePersistor> persistor;
|
||||
std::map<Id, std::unique_ptr<ModulePackage>> modules;
|
||||
- /// Internal sack with module solvables
|
||||
- /// resolveContext = <moduleContext> if moduleMdVersion > 2, else generated from requires
|
||||
- /// solvable.name = <moduleName>:<moduleStream>:<resolveContext>
|
||||
- /// solvable.evr = <moduleVersion>
|
||||
- /// solvable.arch = <moduleArch>
|
||||
- /// solvable.summary = <moduleContext>
|
||||
- /// solvable.description = <moduleName>:<moduleStream>
|
||||
DnfSack * moduleSack;
|
||||
std::unique_ptr<PackageSet> activatedModules;
|
||||
std::string installRoot;
|
||||
@@ -764,10 +757,8 @@ ModulePackageContainer::query(std::string name, std::string stream, std::string
|
||||
query.available();
|
||||
std::ostringstream ss;
|
||||
ss << stringFormater(name) << ":" << stringFormater(stream);
|
||||
- query.addFilter(HY_PKG_DESCRIPTION, HY_GLOB, ss.str().c_str());
|
||||
- if (!context.empty()) {
|
||||
- query.addFilter(HY_PKG_SUMMARY, HY_GLOB, context.c_str());
|
||||
- }
|
||||
+ ss << ":" << stringFormater(context);
|
||||
+ query.addFilter(HY_PKG_NAME, HY_GLOB, ss.str().c_str());
|
||||
if (!arch.empty()) {
|
||||
query.addFilter(HY_PKG_ARCH, HY_GLOB, arch.c_str());
|
||||
}
|
||||
diff --git a/libdnf/module/ModulePackageContainer.hpp b/libdnf/module/ModulePackageContainer.hpp
|
||||
index c1001fce..7e5071b2 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.hpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.hpp
|
||||
@@ -270,7 +270,7 @@ public:
|
||||
*/
|
||||
std::vector<ModulePackage *> query(libdnf::Nsvcap & moduleNevra);
|
||||
/**
|
||||
- * @brief Requiers subject in format <name>, <name>:<stream>, or <name>:<stream>:<contex>
|
||||
+ * @brief Requiers subject in format <name>, <name>:<stream>, or <name>:<stream>:<version>
|
||||
*
|
||||
* @param subject p_subject:...
|
||||
* @return std::vector<ModulePackage *>
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,171 +0,0 @@
|
||||
From 833966d8a8a6c87a3d51447f2adf2aa76190ecd8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 12/19] Revert "Add compatible layer for MdDocuments v2"
|
||||
|
||||
This reverts commit 32ccf6743cb9ce1579ff88804855a94f30876860.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 68 +----------------------
|
||||
libdnf/module/modulemd/ModuleMetadata.cpp | 11 +---
|
||||
libdnf/module/modulemd/ModuleMetadata.hpp | 2 +-
|
||||
3 files changed, 4 insertions(+), 77 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 3f30037e..6e6134d2 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -69,23 +69,6 @@ void goal2name_query(libdnf::Goal & goal, libdnf::Query & query)
|
||||
query.addFilter(HY_PKG_NAME, HY_EQ, module_names.data());
|
||||
}
|
||||
|
||||
-/**
|
||||
- * @brief In python => ";".join(list.sort())
|
||||
- */
|
||||
-std::string concentrateVectorString(std::vector<std::string> & list)
|
||||
-{
|
||||
- if (list.empty()) {
|
||||
- return {};
|
||||
- }
|
||||
- std::sort(list.begin(), list.end());
|
||||
- std::ostringstream ss;
|
||||
- ss << *list.begin();
|
||||
- for (auto require = std::next(list.begin()); require != list.end(); ++require) {
|
||||
- ss << ";" << *require;
|
||||
- }
|
||||
- return ss.str();
|
||||
-}
|
||||
-
|
||||
}
|
||||
|
||||
namespace std {
|
||||
@@ -189,8 +172,6 @@ public:
|
||||
const std::vector<ModulePackage *> & modules, bool debugSolver);
|
||||
bool insert(const std::string &moduleName, const char *path);
|
||||
std::vector<ModulePackage *> getLatestActiveEnabledModules();
|
||||
- /// Required to call after all modules v3 are in metadata
|
||||
- void addVersion2Modules();
|
||||
|
||||
private:
|
||||
friend struct ModulePackageContainer;
|
||||
@@ -204,8 +185,6 @@ private:
|
||||
ModuleMetadata moduleMetadata;
|
||||
|
||||
std::map<std::string, std::string> moduleDefaults;
|
||||
- std::vector<std::tuple<LibsolvRepo *, ModulemdModuleStream *, std::string>> modulesV2;
|
||||
-
|
||||
bool isEnabled(const std::string &name, const std::string &stream);
|
||||
};
|
||||
|
||||
@@ -339,7 +318,6 @@ ModulePackageContainer::add(DnfSack * sack)
|
||||
exception.what()));
|
||||
}
|
||||
}
|
||||
- pImpl->addVersion2Modules();
|
||||
}
|
||||
|
||||
void ModulePackageContainer::addDefaultsFromDisk()
|
||||
@@ -375,7 +353,7 @@ ModulePackageContainer::add(const std::string &fileContent, const std::string &
|
||||
if (strcmp(r->name, "available") == 0) {
|
||||
g_autofree gchar * path = g_build_filename(pImpl->installRoot.c_str(),
|
||||
"/etc/dnf/modules.d", NULL);
|
||||
- auto packages = md.getAllModulePackages(pImpl->moduleSack, r, repoID, pImpl->modulesV2);
|
||||
+ std::vector<ModulePackage *> packages = md.getAllModulePackages(pImpl->moduleSack, r, repoID);
|
||||
for(auto const& modulePackagePtr: packages) {
|
||||
std::unique_ptr<ModulePackage> modulePackage(modulePackagePtr);
|
||||
pImpl->modules.insert(std::make_pair(modulePackage->getId(), std::move(modulePackage)));
|
||||
@@ -1701,50 +1679,6 @@ std::vector<ModulePackage *> ModulePackageContainer::Impl::getLatestActiveEnable
|
||||
return latest;
|
||||
}
|
||||
|
||||
-void ModulePackageContainer::Impl::addVersion2Modules()
|
||||
-{
|
||||
- if (modulesV2.empty()) {
|
||||
- return;
|
||||
- }
|
||||
- std::map<std::string, std::map<std::string, std::vector<ModulePackage *>>> v3_context_map;
|
||||
- for (auto const & module_pair : modules) {
|
||||
- auto * module = module_pair.second.get();
|
||||
- auto requires = module->getRequires(true);
|
||||
- auto concentratedRequires = concentrateVectorString(requires);
|
||||
- v3_context_map[module->getNameStream()][concentratedRequires].push_back(module);
|
||||
- }
|
||||
- libdnf::LibsolvRepo * repo;
|
||||
- ModulemdModuleStream * mdStream;
|
||||
- std::string repoID;
|
||||
- g_autofree gchar * path = g_build_filename(installRoot.c_str(), "/etc/dnf/modules.d", NULL);
|
||||
- for (auto & module_tuple : modulesV2) {
|
||||
- std::tie(repo, mdStream, repoID) = module_tuple;
|
||||
- auto nameStream = ModulePackage::getNameStream(mdStream);
|
||||
- auto requires = ModulePackage::getRequires(mdStream, true);
|
||||
- auto concentratedRequires = concentrateVectorString(requires);
|
||||
- auto streamIterator = v3_context_map.find(nameStream);
|
||||
- if (streamIterator != v3_context_map.end()) {
|
||||
- auto contextIterator = streamIterator->second.find(concentratedRequires);
|
||||
- if (contextIterator != streamIterator->second.end()) {
|
||||
- auto v3_context = contextIterator->second[0]->getContext();
|
||||
- std::unique_ptr<ModulePackage> modulePackage(new ModulePackage(moduleSack, repo, mdStream, repoID, v3_context));
|
||||
- persistor->insert(modulePackage->getName(), path);
|
||||
- modules.insert(std::make_pair(modulePackage->getId(), std::move(modulePackage)));
|
||||
- g_object_unref(mdStream);
|
||||
- continue;
|
||||
- }
|
||||
- }
|
||||
- if (concentratedRequires.empty()) {
|
||||
- concentratedRequires.append("NoRequires");
|
||||
- }
|
||||
- std::unique_ptr<ModulePackage> modulePackage(new ModulePackage(moduleSack, repo, mdStream, repoID, concentratedRequires));
|
||||
- persistor->insert(modulePackage->getName(), path);
|
||||
- modules.insert(std::make_pair(modulePackage->getId(), std::move(modulePackage)));
|
||||
- g_object_unref(mdStream);
|
||||
- }
|
||||
- modulesV2.clear();
|
||||
-}
|
||||
-
|
||||
void ModulePackageContainer::updateFailSafeData()
|
||||
{
|
||||
auto fileNames = getYamlFilenames(pImpl->persistDir.c_str());
|
||||
diff --git a/libdnf/module/modulemd/ModuleMetadata.cpp b/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
index 07817ce1..fbdd8a13 100644
|
||||
--- a/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
+++ b/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
@@ -126,8 +126,7 @@ void ModuleMetadata::resolveAddedMetadata()
|
||||
|
||||
std::vector<ModulePackage *> ModuleMetadata::getAllModulePackages(DnfSack * moduleSack,
|
||||
LibsolvRepo * repo,
|
||||
- const std::string & repoID,
|
||||
- std::vector<std::tuple<LibsolvRepo *, ModulemdModuleStream *, std::string>> & modulesV2)
|
||||
+ const std::string & repoID)
|
||||
{
|
||||
std::vector<ModulePackage *> result;
|
||||
if (!resultingModuleIndex)
|
||||
@@ -141,13 +140,7 @@ std::vector<ModulePackage *> ModuleMetadata::getAllModulePackages(DnfSack * modu
|
||||
//TODO(amatej): replace with
|
||||
//GPtrArray * streams = modulemd_module_index_search_streams_by_nsvca_glob(resultingModuleIndex, NULL);
|
||||
for (unsigned int i = 0; i < streams->len; i++){
|
||||
- ModulemdModuleStream * moduleMdStream = static_cast<ModulemdModuleStream *>(g_ptr_array_index(streams, i));
|
||||
- if (modulemd_module_stream_get_mdversion(moduleMdStream) > 2) {
|
||||
- result.push_back(new ModulePackage(moduleSack, repo, moduleMdStream, repoID));
|
||||
- } else {
|
||||
- g_object_ref(moduleMdStream);
|
||||
- modulesV2.push_back(std::make_tuple(repo, moduleMdStream, repoID));
|
||||
- }
|
||||
+ result.push_back(new ModulePackage(moduleSack, repo, (ModulemdModuleStream *) g_ptr_array_index(streams, i), repoID));
|
||||
}
|
||||
}
|
||||
|
||||
diff --git a/libdnf/module/modulemd/ModuleMetadata.hpp b/libdnf/module/modulemd/ModuleMetadata.hpp
|
||||
index 901d7402..df753b11 100644
|
||||
--- a/libdnf/module/modulemd/ModuleMetadata.hpp
|
||||
+++ b/libdnf/module/modulemd/ModuleMetadata.hpp
|
||||
@@ -36,7 +36,7 @@ public:
|
||||
~ModuleMetadata();
|
||||
void addMetadataFromString(const std::string & yaml, int priority);
|
||||
void resolveAddedMetadata();
|
||||
- std::vector<ModulePackage *> getAllModulePackages(DnfSack * moduleSack, LibsolvRepo * repo, const std::string & repoID, std::vector<std::tuple<LibsolvRepo *, ModulemdModuleStream *, std::string>> & modulesV2);
|
||||
+ std::vector<ModulePackage *> getAllModulePackages(DnfSack * moduleSack, LibsolvRepo * repo, const std::string & repoID);
|
||||
std::map<std::string, std::string> getDefaultStreams();
|
||||
std::vector<std::string> getDefaultProfiles(std::string moduleName, std::string moduleStream);
|
||||
ModulemdObsoletes * getNewestActiveObsolete(ModulePackage *p);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,77 +0,0 @@
|
||||
From b1ed6e111ce05f8f1fe7b35afc1a3ef6f0731f7c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 13/19] Revert "Add an alternative constructor for
|
||||
ModulePackage"
|
||||
|
||||
This reverts commit d05bb263de6822c13ac4bd5cca3628318f5c7ce7.
|
||||
---
|
||||
libdnf/module/ModulePackage.cpp | 24 ++++++++++++------------
|
||||
libdnf/module/ModulePackage.hpp | 2 +-
|
||||
2 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
|
||||
index 63ee1656..8126bcaa 100644
|
||||
--- a/libdnf/module/ModulePackage.cpp
|
||||
+++ b/libdnf/module/ModulePackage.cpp
|
||||
@@ -43,16 +43,16 @@ extern "C" {
|
||||
|
||||
namespace libdnf {
|
||||
|
||||
-/**
|
||||
- * @brief create solvable with:
|
||||
- * Name: $name:$stream:$context
|
||||
- * Version: $version
|
||||
- * Arch: $arch (If arch is not defined, set "noarch")
|
||||
- * Provides: module($name)
|
||||
- * Provides: module($name:$stream)
|
||||
- */
|
||||
-static void setSovable(Pool * pool, Solvable * solvable, const std::string & name,
|
||||
- const std::string & stream, const std::string & version, const std::string & context, const char * arch)
|
||||
+ /**
|
||||
+ * @brief create solvable with:
|
||||
+ * Name: $name:$stream:$context
|
||||
+ * Version: $version
|
||||
+ * Arch: $arch (If arch is not defined, set "noarch")
|
||||
+ * Provides: module($name)
|
||||
+ * Provides: module($name:$stream)
|
||||
+ */
|
||||
+ static void setSovable(Pool * pool, Solvable *solvable, std::string & name,
|
||||
+ std::string & stream, std::string & version, std::string & context, const char * arch)
|
||||
{
|
||||
std::ostringstream ss;
|
||||
// Name: $name:$stream:$context
|
||||
@@ -86,7 +86,7 @@ static std::pair<std::string, std::string> parsePlatform(const std::string & pla
|
||||
}
|
||||
|
||||
ModulePackage::ModulePackage(DnfSack * moduleSack, LibsolvRepo * repo,
|
||||
- ModulemdModuleStream * mdStream, const std::string & repoID, const std::string & context)
|
||||
+ ModulemdModuleStream * mdStream, const std::string & repoID)
|
||||
: mdStream(mdStream)
|
||||
, moduleSack(moduleSack)
|
||||
, repoID(repoID)
|
||||
@@ -98,7 +98,7 @@ ModulePackage::ModulePackage(DnfSack * moduleSack, LibsolvRepo * repo,
|
||||
id = repo_add_solvable(repo);
|
||||
Solvable *solvable = pool_id2solvable(pool, id);
|
||||
|
||||
- setSovable(pool, solvable, getName(), getStream(), getVersion(), context.empty() ? getContext() : context, getArchCStr());
|
||||
+ setSovable(pool, solvable, getName(), getStream(), getVersion(), getContext(), getArchCStr());
|
||||
createDependencies(solvable);
|
||||
HyRepo hyRepo = static_cast<HyRepo>(repo->appdata);
|
||||
libdnf::repoGetImpl(hyRepo)->needs_internalizing = 1;
|
||||
diff --git a/libdnf/module/ModulePackage.hpp b/libdnf/module/ModulePackage.hpp
|
||||
index 145c6d63..47cc995c 100644
|
||||
--- a/libdnf/module/ModulePackage.hpp
|
||||
+++ b/libdnf/module/ModulePackage.hpp
|
||||
@@ -95,7 +95,7 @@ private:
|
||||
friend struct ModuleMetadata;
|
||||
|
||||
ModulePackage(DnfSack * moduleSack, LibsolvRepo * repo,
|
||||
- ModulemdModuleStream * mdStream, const std::string & repoID, const std::string & context = {});
|
||||
+ ModulemdModuleStream * mdStream, const std::string & repoID);
|
||||
|
||||
ModulePackage(const ModulePackage & mpkg);
|
||||
ModulePackage & operator=(const ModulePackage & mpkg);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,113 +0,0 @@
|
||||
From 6c9540be5ac3e3bc3f9a60133b402945705b934f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 14/19] Revert "Adjust modular solver to new context type"
|
||||
|
||||
This reverts commit 921d4db62cda41f7999aff67882ad0c01c766916.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 46 +++++-------------------
|
||||
1 file changed, 8 insertions(+), 38 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index 6e6134d2..c0ad1260 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -49,28 +49,6 @@ extern "C" {
|
||||
#include "modulemd/ModuleMetadata.hpp"
|
||||
#include "modulemd/ModuleProfile.hpp"
|
||||
|
||||
-
|
||||
-namespace {
|
||||
-
|
||||
-/// Requires resolved goal
|
||||
-/// Takes listInstalls() from goal and keep solvables with the solvable-name (<name>:<stream>:<context>) in query
|
||||
-void goal2name_query(libdnf::Goal & goal, libdnf::Query & query)
|
||||
-{
|
||||
- auto pool = dnf_sack_get_pool(goal.getSack());
|
||||
- auto installList = goal.listInstalls();
|
||||
- std::vector<const char *> module_names;
|
||||
- Id id = -1;
|
||||
- while ((id = installList.next(id)) != -1) {
|
||||
- Solvable * s = pool_id2solvable(pool, id);
|
||||
- const char * name = pool_id2str(pool, s->name);
|
||||
- module_names.push_back(name);
|
||||
- }
|
||||
- module_names.push_back(nullptr);
|
||||
- query.addFilter(HY_PKG_NAME, HY_EQ, module_names.data());
|
||||
-}
|
||||
-
|
||||
-}
|
||||
-
|
||||
namespace std {
|
||||
|
||||
template<>
|
||||
@@ -651,14 +629,14 @@ ModulePackageContainer::Impl::moduleSolve(const std::vector<ModulePackage *> & m
|
||||
for (const auto &module : modules) {
|
||||
std::ostringstream ss;
|
||||
auto name = module->getName();
|
||||
- ss << "module(" << name << ":" << module->getStream() << ")";
|
||||
+ ss << "module(" << name << ":" << module->getStream() << ":" << module->getVersion() << ")";
|
||||
Selector selector(moduleSack);
|
||||
bool optional = persistor->getState(name) == ModuleState::DEFAULT;
|
||||
selector.set(HY_PKG_PROVIDES, HY_EQ, ss.str().c_str());
|
||||
goal.install(&selector, optional);
|
||||
goalWeak.install(&selector, true);
|
||||
}
|
||||
- auto ret = goal.run(static_cast<DnfGoalActions>(DNF_IGNORE_WEAK | DNF_FORCE_BEST));
|
||||
+ auto ret = goal.run(DNF_IGNORE_WEAK);
|
||||
if (debugSolver) {
|
||||
goal.writeDebugdata("debugdata/modules");
|
||||
}
|
||||
@@ -666,7 +644,7 @@ ModulePackageContainer::Impl::moduleSolve(const std::vector<ModulePackage *> & m
|
||||
auto problemType = ModulePackageContainer::ModuleErrorType::NO_ERROR;
|
||||
if (ret) {
|
||||
problems = goal.describeAllProblemRules(false);
|
||||
- ret = goal.run(DNF_FORCE_BEST);
|
||||
+ ret = goal.run(DNF_NONE);
|
||||
if (ret) {
|
||||
// Conflicting modules has to be removed otherwice it could result than one of them will
|
||||
// be active
|
||||
@@ -680,20 +658,14 @@ ModulePackageContainer::Impl::moduleSolve(const std::vector<ModulePackage *> & m
|
||||
activatedModules.reset();
|
||||
} else {
|
||||
problemType = ModulePackageContainer::ModuleErrorType::ERROR;
|
||||
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- goal2name_query(goalWeak, query);
|
||||
- activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
+ activatedModules.reset(new PackageSet(std::move(goalWeak.listInstalls())));
|
||||
}
|
||||
} else {
|
||||
problemType = ModulePackageContainer::ModuleErrorType::ERROR_IN_DEFAULTS;
|
||||
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- goal2name_query(goal, query);
|
||||
- activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
+ activatedModules.reset(new PackageSet(std::move(goal.listInstalls())));
|
||||
}
|
||||
} else {
|
||||
- Query query(moduleSack, Query::ExcludeFlags::IGNORE_EXCLUDES);
|
||||
- goal2name_query(goal, query);
|
||||
- activatedModules.reset(new PackageSet(*query.runSet()));
|
||||
+ activatedModules.reset(new PackageSet(std::move(goal.listInstalls())));
|
||||
}
|
||||
return make_pair(problems, problemType);
|
||||
}
|
||||
@@ -735,14 +707,12 @@ ModulePackageContainer::query(std::string name, std::string stream, std::string
|
||||
query.available();
|
||||
std::ostringstream ss;
|
||||
ss << stringFormater(name) << ":" << stringFormater(stream);
|
||||
- ss << ":" << stringFormater(context);
|
||||
+ ss << ":" << stringFormater(version) << ":";
|
||||
+ ss << stringFormater(context);
|
||||
query.addFilter(HY_PKG_NAME, HY_GLOB, ss.str().c_str());
|
||||
if (!arch.empty()) {
|
||||
query.addFilter(HY_PKG_ARCH, HY_GLOB, arch.c_str());
|
||||
}
|
||||
- if (!version.empty()) {
|
||||
- query.addFilter(HY_PKG_VERSION, HY_GLOB, version.c_str());
|
||||
- }
|
||||
auto pset = query.runSet();
|
||||
Id moduleId = -1;
|
||||
while ((moduleId = pset->next(moduleId)) != -1) {
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,65 +0,0 @@
|
||||
From 50aa9f29dbfc1523a3b6aea41c6caa37f30c1bf0 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
||||
Subject: [PATCH 15/19] Revert "Change usage of context and version in modular
|
||||
solver"
|
||||
|
||||
This reverts commit 1f4c5b2a37ec333b23a12b882b046fac858155aa.
|
||||
---
|
||||
libdnf/module/ModulePackage.cpp | 28 ++++++++++++++--------------
|
||||
1 file changed, 14 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
|
||||
index 8126bcaa..eea4a8b5 100644
|
||||
--- a/libdnf/module/ModulePackage.cpp
|
||||
+++ b/libdnf/module/ModulePackage.cpp
|
||||
@@ -43,25 +43,19 @@ extern "C" {
|
||||
|
||||
namespace libdnf {
|
||||
|
||||
- /**
|
||||
- * @brief create solvable with:
|
||||
- * Name: $name:$stream:$context
|
||||
- * Version: $version
|
||||
- * Arch: $arch (If arch is not defined, set "noarch")
|
||||
- * Provides: module($name)
|
||||
- * Provides: module($name:$stream)
|
||||
- */
|
||||
- static void setSovable(Pool * pool, Solvable *solvable, std::string & name,
|
||||
- std::string & stream, std::string & version, std::string & context, const char * arch)
|
||||
+static void setSovable(Pool * pool, Solvable *solvable, std::string name,
|
||||
+ std::string stream, std::string version, std::string context, const char * arch)
|
||||
{
|
||||
std::ostringstream ss;
|
||||
- // Name: $name:$stream:$context
|
||||
- ss << name << ":" << stream << ":" << context;
|
||||
+ // create solvable with:
|
||||
+ // Name: $name:$stream:$version:$context
|
||||
+ // Version: 0
|
||||
+ // Arch: $arch
|
||||
+ ss << name << ":" << stream << ":" << version << ":" << context;
|
||||
solvable_set_str(solvable, SOLVABLE_NAME, ss.str().c_str());
|
||||
- solvable_set_str(solvable, SOLVABLE_EVR, version.c_str());
|
||||
+ solvable_set_str(solvable, SOLVABLE_EVR, "0");
|
||||
// TODO Test can be remove when modules will be always with arch
|
||||
solvable_set_str(solvable, SOLVABLE_ARCH, arch ? arch : "noarch");
|
||||
-
|
||||
// create Provide: module($name)
|
||||
ss.str(std::string());
|
||||
ss << "module(" << name << ")";
|
||||
@@ -73,6 +67,12 @@ namespace libdnf {
|
||||
ss << "module(" << name << ":" << stream << ")";
|
||||
depId = pool_str2id(pool, ss.str().c_str(), 1);
|
||||
solvable_add_deparray(solvable, SOLVABLE_PROVIDES, depId, -1);
|
||||
+
|
||||
+ // create Provide: module($name:$stream:$version)
|
||||
+ ss.str(std::string());
|
||||
+ ss << "module(" << name << ":" << stream << ":" << version << ")";
|
||||
+ depId = pool_str2id(pool, ss.str().c_str(), 1);
|
||||
+ solvable_add_deparray(solvable, SOLVABLE_PROVIDES, depId, -1);
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From faaa64a51445b6edffe6f1e65c465dea63f11bf7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Tue, 27 Apr 2021 10:24:53 +0200
|
||||
Subject: [PATCH 16/19] Fix failing unittest, caused by the revert of new
|
||||
modular implementation
|
||||
|
||||
The problem is not caused by advisory filtering which we are testing
|
||||
here, the `query` is already created with just one package.
|
||||
---
|
||||
tests/libdnf/sack/QueryTest.cpp | 5 +----
|
||||
1 file changed, 1 insertion(+), 4 deletions(-)
|
||||
|
||||
diff --git a/tests/libdnf/sack/QueryTest.cpp b/tests/libdnf/sack/QueryTest.cpp
|
||||
index ee9eeaf4..7c3a22af 100644
|
||||
--- a/tests/libdnf/sack/QueryTest.cpp
|
||||
+++ b/tests/libdnf/sack/QueryTest.cpp
|
||||
@@ -139,13 +139,10 @@ void QueryTest::testQueryFilterAdvisory()
|
||||
dnf_sack_filter_modules_v2(sack, modules, nullptr, tmpdir, nullptr, true, false, false);
|
||||
query = new libdnf::Query(sack);
|
||||
query->addFilter(HY_PKG_ADVISORY_TYPE, HY_EQ, "enhancement");
|
||||
- CPPUNIT_ASSERT(query->size() == 2);
|
||||
+ CPPUNIT_ASSERT(query->size() == 1);
|
||||
libdnf::PackageSet pset2 = *(query->getResultPset());
|
||||
pkg = dnf_package_new(sack, pset2[0]);
|
||||
CPPUNIT_ASSERT(!g_strcmp0(dnf_package_get_name(pkg), "test-perl-DBI"));
|
||||
g_object_unref(pkg);
|
||||
- pkg = dnf_package_new(sack, pset2[1]);
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(dnf_package_get_name(pkg), "test-perl-DBI"));
|
||||
- g_object_unref(pkg);
|
||||
delete query;
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,274 +0,0 @@
|
||||
From a61b0105aafeea8487902463f789e6ed00021eb3 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Mracek <jmracek@redhat.com>
|
||||
Date: Wed, 5 May 2021 15:55:43 +0200
|
||||
Subject: [PATCH 17/19] Modify unit test after change of handling advisories
|
||||
|
||||
The patch modifies also yaml with multicollection situation by adding
|
||||
module requires.
|
||||
---
|
||||
data/tests/advisories/modules.yaml | 6 +++++
|
||||
.../tests/advisories/repodata/modules.yaml.gz | Bin 300 -> 332 bytes
|
||||
data/tests/advisories/repodata/primary.xml.gz | Bin 743 -> 743 bytes
|
||||
data/tests/advisories/repodata/repomd.xml | 24 +++++++++---------
|
||||
tests/libdnf/sack/AdvisoryTest.cpp | 22 ++++++----------
|
||||
tests/libdnf/sack/QueryTest.cpp | 24 ++++++++----------
|
||||
6 files changed, 37 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/data/tests/advisories/modules.yaml b/data/tests/advisories/modules.yaml
|
||||
index 6db5053a..b5f23f7d 100644
|
||||
--- a/data/tests/advisories/modules.yaml
|
||||
+++ b/data/tests/advisories/modules.yaml
|
||||
@@ -32,6 +32,9 @@ data:
|
||||
license:
|
||||
module:
|
||||
- MIT
|
||||
+ dependencies:
|
||||
+ - requires:
|
||||
+ perl: ["5.23"]
|
||||
profiles:
|
||||
default:
|
||||
rpms: ["test-perl-DBI"]
|
||||
@@ -52,6 +55,9 @@ data:
|
||||
license:
|
||||
module:
|
||||
- MIT
|
||||
+ dependencies:
|
||||
+ - requires:
|
||||
+ perl: ["5.25"]
|
||||
profiles:
|
||||
default:
|
||||
rpms: ["test-perl-DBI"]
|
||||
diff --git a/data/tests/advisories/repodata/modules.yaml.gz b/data/tests/advisories/repodata/modules.yaml.gz
|
||||
index 7158e6c515720c87373762d722e9c438ac7fd8d3..ed39532dfcdec084a661d51d86e07bd3e4246f69 100644
|
||||
GIT binary patch
|
||||
literal 332
|
||||
zcmV-S0ki%eiwFP!000001I>{=Ps1<}hWGr6Q`gE7ag#Rnz<^jfATh8ZR2}w3Sc;us
|
||||
zJE;77+&V2`Kt&yZ?cV$H`F$8;nd;<V$OZwXQ$tHeWpCuX?yLZwDGVqw0E>nM^yJzo
|
||||
zd~k$Dz^uyoVipspfg%do*+9Fv4>2lq@<qU|UT&A=esnMf-MfJMv`UeePWRz3ea&J9
|
||||
zj-^&hvYx~tmu^cjgS*W`jC$8Kx+R~oiW(f+kOYA1jX%Z=0{Otk>(K?>pbTUAvvJbK
|
||||
zu0;G>$%;HZyrs6DS4GX|H7^S!#q;q?d7fwN0vp-w&1Pz)K_AF{F_TZt<j-f!92b6P
|
||||
z=vY2$s-m8(A}e(=mVu+!K|4CRxxZe(<DUJ~g%rkPencX+Mj8d<QxwapUd`9_YK@Jn
|
||||
eejSDUe<-TIL$NBWgd)&lisAzcI?AeD1ONa}51~l_
|
||||
|
||||
literal 300
|
||||
zcmV+{0n`2;iwFP!000001Kp56Ps1<}#rJ%QQ`g85ar4LZz<^jfATh94hka2a*-2zO
|
||||
zsC;`&okAE82nhzZd++X^&p*akrbjhf8iE8n>e-Oh*%LY6kAnoBX$&YcfB`K@n8=wZ
|
||||
zd~k$T!lo|xb`y=ag)#~?4uMWF4>2lq>L}qPnnP2)uFlq?dzNsYqBMEs`YD{ZuUT~9
|
||||
z(lWiG!IM0D>9$lexZ6L(YI0-O8}iB3)ZuJG5&&+p{!%jt<O5r-M;H1IRan~ZgR3!i
|
||||
zCF9>JRu<{u0~wLmrQo^XRf(i|v3#j0ij4gLBfGuXuTfg`f!qg}d<~O7egSg{{0!*Q
|
||||
y{uQW8_P4;s(FnI>d`-5gMVs$LyTi`ae@<5YXR>WoC$fRIYqBpd!@UUm0{{Tgm5(X_
|
||||
|
||||
diff --git a/data/tests/advisories/repodata/primary.xml.gz b/data/tests/advisories/repodata/primary.xml.gz
|
||||
index da9ffaf08328659c47be8721a9c478ff64ba0a4d..96cbaa2a5a2361b1e5cd59ddb7de937339982c5f 100644
|
||||
GIT binary patch
|
||||
literal 743
|
||||
zcmV<D0vP=tiwFP!000001Lao9Zrd;rz2_?ko>~O9B%0I`ND2@%1#&3RBI%*0fTBhg
|
||||
zVQr-(BktFi)Dqj>k`zsgpnzeM!#6X0Z#V;o=XYg+wxC*BR}prWHbzj1I+fKr!XIzm
|
||||
zE_{3*pM)iJJmnon8eX*#&bzKTv#df^{oOL{H?V}Xw`P<j>awgWJfhE3Q$FaSF&H&m
|
||||
zZ1@^<e1dh-X^XmD0}(ce_ynP_;w8i#wB4csRV?0IT!q$PGlyJ>JihbYTbG8`urbz&
|
||||
zAcCeAd4x4dZP9cwQc&n@%d$@U0&b!3PhIAFr-APUJW~u?gTKf@Y}&q@uF~e5FjwDq
|
||||
zvzBRuKV4qqc$Eb!8hEKs2%}j*IQ0ebAY}{^!F=%3#H9{l`Y>@gB?&m5V>{r|AoIZ2
|
||||
zx1Ey=8TD_;)o$Ra)1ddG7NIpC7*GnWP_pSXwfN*Fmo3sCj%Hbqah^pDts}Jdo(@zT
|
||||
zTK7w1?^U5q=G*K#Spv#rp=moVv3)HJ)zp(-7Mi-ld=@yAIAl_)m0w^^8DZD<DMqqt
|
||||
zJ6;r!4$7ON$gK%S=;Tz?f}3lhTtOD$quMT<#m~#L94oyvZ(|IV)vDy3S?Y~8pA}L-
|
||||
z)k6I4>L#=f4SUEIs<bvT9BlTdYgPA6e7$QsDA8rLm8z~vs5<L{w=nvQkiE+wPF}ZN
|
||||
zY?u{hH3IhsdvII#N`PL)PvG4uVMvcr_Yw9{bKohch2oWNAT7V@B21Z0O?#)NFw`Cu
|
||||
zoA8aQw^F~5(KHz~OSMC$x4tO~Mp?nvx=$}Z;NNYkhqJuW)m^ys^`FT$YIV$W$gkjY
|
||||
zFV$nH|LP)aIX~w))nVMwnjhwUv;DgP=TSDQ)4}TT1CDdwag)qW1VF|-lF*b;;bZ|1
|
||||
zAaQI#T&4p%e8n;rxT^$g0fA4l#Lc{bQ1?X-INM$QwE=fnp8sjU9r1o~1Md5#dd>m&
|
||||
ZqioMV;M}JUxcmQi@mJ$x7+z@#006pgY0dxu
|
||||
|
||||
literal 743
|
||||
zcmV<D0vP=tiwFP!000001LamrZ`&{ozV}xMI&CNtTZ-gIVY@)F4(MUPhIWUY3R$LO
|
||||
zBYsV`gJ!>ek{?a7SKDFTPz(qXk^D&NBSj*?`CVC{EvPoHs}Pf=jS*C`PV#CU;*U3P
|
||||
z7al&3PJ$9Tk%&$p4X@e|XI<BvSyqu({oOL@H?V}Hw`P<j>$0pXJfhE3Q$FaSF&H&M
|
||||
zZp0dNe2R6_NkrYQfe;%+bb?S&i4vj?+HTQ+Di&`pt^#Y&8KY1#i|#z<)?tA)2u3>*
|
||||
zM9|bS3$Z4tHJUC)3JRTVS=LEkz%3Nsslz?@)c0Ipq>5u}@Ru3LP1~2#RoYBY?&$k&
|
||||
z)_D@*PnXv?TBZJq`EKG-%311D!8}P_NH~XBau2*Db{L^t8)G6Eje)qtCg3nXb-~lO
|
||||
zos$e1^=~QEZs4iYp!Z`f0&6xHPy($~dDCfX(aBAgw@7~kn#+QW^IX)xIznsj$)KXZ
|
||||
zx<49yuL`X)-$v^45>T2Knl^C=^<0m+ntI&lg{Drp$9=*mp;M*W{0qz}L+scd!zi!X
|
||||
zP80<sL*-3V@~sI++2mBzQkZL@OhFprquwsa;^*yIj-6hbw=srFYgLNQ9JQd;XGJcd
|
||||
zY9V@ebrV>JialftRZ^QW90+^sTGf3MUGLfsN_1Imb5&O*RGoDpS{Qvs$lhfrPFA;F
|
||||
zWSAA^Gy?aAJ-DrVB|)E}C-82SG^EF<`w07}8HfbbLWxQbkS@RKLd>|$%y=iJG0Yw-
|
||||
zHsKppZ*%=ZM%AR$EY%K~+4`m_7^Q_+>p8vrfPZ(W9?tSgcX#2i*MBD4SgT{6Lw*IH
|
||||
z`&>PS`mZj+m-BO;Qys<)todQy58J<6a4zFxbvjr*e!&Uh5hqUVSOTQnr7=q=lO*+p
|
||||
z4>7SNb+`^p#EPffcUCdj5`2%Qv6H$!WzLIUaJIAhYYXnMJ^#~!JL3J~7Totk^_&at
|
||||
ZN7<f#!8uP|aQFZ3qOUfbJ%VWp006EqV{!lh
|
||||
|
||||
diff --git a/data/tests/advisories/repodata/repomd.xml b/data/tests/advisories/repodata/repomd.xml
|
||||
index 21630e04..c9468e82 100644
|
||||
--- a/data/tests/advisories/repodata/repomd.xml
|
||||
+++ b/data/tests/advisories/repodata/repomd.xml
|
||||
@@ -1,11 +1,11 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<repomd xmlns="http://linux.duke.edu/metadata/repo" xmlns:rpm="http://linux.duke.edu/metadata/rpm">
|
||||
- <revision>1612879414</revision>
|
||||
+ <revision>1620890113</revision>
|
||||
<data type="primary">
|
||||
- <checksum type="sha256">b69e4467719314fdb155872cf9c8e895d5b169c0506c5180c512d693c48f0f4b</checksum>
|
||||
- <open-checksum type="sha256">8606d1f777859f167f7bd0bf8a1d532abedcb4db143b719e631e1040800fd1f0</open-checksum>
|
||||
+ <checksum type="sha256">f2f306a22a157730d2f13f09fc36c425b9bedfc0ecaf74d8b60d98222ebb3274</checksum>
|
||||
+ <open-checksum type="sha256">ef20a9175429f9f223c4bdcd634fc218bdd85799095438d349efea159cfd2bdf</open-checksum>
|
||||
<location href="repodata/primary.xml.gz"/>
|
||||
- <timestamp>1612879414</timestamp>
|
||||
+ <timestamp>1620890113</timestamp>
|
||||
<size>743</size>
|
||||
<open-size>2665</open-size>
|
||||
</data>
|
||||
@@ -13,7 +13,7 @@
|
||||
<checksum type="sha256">efbf7f021163a3c7698a257351e327102c60bb39a7bdceee77c421f064205e99</checksum>
|
||||
<open-checksum type="sha256">ca5620e2734574d04d3c01ae5a72f865313369954698d71776076b9cbd831bbd</open-checksum>
|
||||
<location href="repodata/filelists.xml.gz"/>
|
||||
- <timestamp>1612879414</timestamp>
|
||||
+ <timestamp>1620890113</timestamp>
|
||||
<size>311</size>
|
||||
<open-size>511</open-size>
|
||||
</data>
|
||||
@@ -21,23 +21,23 @@
|
||||
<checksum type="sha256">6673953e1f28f55b9d4c3f38a9e3c0e0ff88ad06fb693b7f15eb241a81b80d71</checksum>
|
||||
<open-checksum type="sha256">0997c242bf1b96372d7a625a73de23dced68cae9375baff0c73215a07693b3f4</open-checksum>
|
||||
<location href="repodata/other.xml.gz"/>
|
||||
- <timestamp>1612879414</timestamp>
|
||||
+ <timestamp>1620890113</timestamp>
|
||||
<size>310</size>
|
||||
<open-size>507</open-size>
|
||||
</data>
|
||||
<data type="modules">
|
||||
- <checksum type="sha256">a815d0669b15b97dd6260713405c79045eeda10aedb6460a0f742b86cc236cca</checksum>
|
||||
- <open-checksum type="sha256">0d1063b74e3a7cb4c7cdc3b2080b1901c347693140765534f8c5c3d8b964778a</open-checksum>
|
||||
+ <checksum type="sha256">df1abc1ab7dacc6ea2bc16c2b14abeb32d0ec9d9ed01378488cec22540f9607b</checksum>
|
||||
+ <open-checksum type="sha256">f088c4096bfc4acad99a20e06d0d4381872c10f0f27ff8bbfe1bada658ff7afd</open-checksum>
|
||||
<location href="repodata/modules.yaml.gz"/>
|
||||
- <timestamp>1612879414</timestamp>
|
||||
- <size>300</size>
|
||||
- <open-size>1019</open-size>
|
||||
+ <timestamp>1620890113</timestamp>
|
||||
+ <size>332</size>
|
||||
+ <open-size>1117</open-size>
|
||||
</data>
|
||||
<data type="updateinfo">
|
||||
<checksum type="sha256">9d791d16c2adc2d7d4c85b45f2a704edac62a926b09fc20df73207f4190acd49</checksum>
|
||||
<open-checksum type="sha256">3cf7df860860ac7a4a8e64a1a2d71c1ec43225dacbfe09a0cff80f28be3825da</open-checksum>
|
||||
<location href="repodata/updateinfo.xml.gz"/>
|
||||
- <timestamp>1612879414</timestamp>
|
||||
+ <timestamp>1620890113</timestamp>
|
||||
<size>708</size>
|
||||
<open-size>2414</open-size>
|
||||
</data>
|
||||
diff --git a/tests/libdnf/sack/AdvisoryTest.cpp b/tests/libdnf/sack/AdvisoryTest.cpp
|
||||
index 805c35da..1abf1a95 100644
|
||||
--- a/tests/libdnf/sack/AdvisoryTest.cpp
|
||||
+++ b/tests/libdnf/sack/AdvisoryTest.cpp
|
||||
@@ -97,11 +97,9 @@ void AdvisoryTest::testGetApplicablePackagesModulesNotSetup()
|
||||
|
||||
// When modules are not setup all advisory collections are applicable and we get all packages
|
||||
advisory->getApplicablePackages(pkgsvector);
|
||||
- CPPUNIT_ASSERT(pkgsvector.size() == 4);
|
||||
+ CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(pkgsvector.size()));
|
||||
CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "test-perl-DBI-new-collection-override"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[2].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[3].getNameString(), "not-present"));
|
||||
+ CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "not-present"));
|
||||
}
|
||||
|
||||
void AdvisoryTest::testGetApplicablePackagesModulesSetupNoneEnabled()
|
||||
@@ -122,16 +120,14 @@ void AdvisoryTest::testGetApplicablePackagesOneApplicableCollection()
|
||||
{
|
||||
std::vector<libdnf::AdvisoryPkg> pkgsvector;
|
||||
|
||||
- // When I keep enabled only perl-DBI module I get packages from all collections that contain that module
|
||||
+ // When I keep enabled only perl module I get packages from all collections that contain that module
|
||||
libdnf::ModulePackageContainer * modules = dnf_sack_get_module_container(sack);
|
||||
- modules->reset("perl");
|
||||
+ modules->reset("perl-DBI");
|
||||
dnf_sack_filter_modules_v2(sack, modules, nullptr, tmpdir, nullptr, true, false, false);
|
||||
|
||||
advisory->getApplicablePackages(pkgsvector);
|
||||
- CPPUNIT_ASSERT(pkgsvector.size() == 3);
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "test-perl-DBI-new-collection-override"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[2].getNameString(), "test-perl-DBI"));
|
||||
+ CPPUNIT_ASSERT(pkgsvector.size() == 1);
|
||||
+ CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "not-present"));
|
||||
}
|
||||
|
||||
void AdvisoryTest::testGetApplicablePackagesMultipleApplicableCollections()
|
||||
@@ -141,11 +137,9 @@ void AdvisoryTest::testGetApplicablePackagesMultipleApplicableCollections()
|
||||
// When I enable modules from multiple collections -> I get packages from all applicable collections
|
||||
// Enabled - "perl-DBI:master", "perl:5.23"
|
||||
advisory->getApplicablePackages(pkgsvector);
|
||||
- CPPUNIT_ASSERT(pkgsvector.size() == 4);
|
||||
+ CPPUNIT_ASSERT(pkgsvector.size() == 2);
|
||||
CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "test-perl-DBI-new-collection-override"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[2].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[3].getNameString(), "not-present"));
|
||||
+ CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "not-present"));
|
||||
}
|
||||
|
||||
void AdvisoryTest::testGetModules()
|
||||
diff --git a/tests/libdnf/sack/QueryTest.cpp b/tests/libdnf/sack/QueryTest.cpp
|
||||
index 7c3a22af..d4cc28c2 100644
|
||||
--- a/tests/libdnf/sack/QueryTest.cpp
|
||||
+++ b/tests/libdnf/sack/QueryTest.cpp
|
||||
@@ -59,12 +59,13 @@ void QueryTest::testQueryGetAdvisoryPkgs()
|
||||
HyQuery query = new libdnf::Query(sack);
|
||||
std::vector<libdnf::AdvisoryPkg> advisoryPkgs;
|
||||
|
||||
- // When modules are not setup all advisory collections are applicable
|
||||
+ // Apply advisory only from active context - receave advisory package only from releted collection
|
||||
query->getAdvisoryPkgs(HY_EQ, advisoryPkgs);
|
||||
- CPPUNIT_ASSERT(advisoryPkgs.size() == 2);
|
||||
- // We get test-perl-DBI twice because its in two collections
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(advisoryPkgs[0].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(advisoryPkgs[1].getNameString(), "test-perl-DBI"));
|
||||
+ CPPUNIT_ASSERT(advisoryPkgs.size() == 1);
|
||||
+
|
||||
+ CPPUNIT_ASSERT_EQUAL(std::string("test-perl-DBI"), std::string(advisoryPkgs[0].getNameString()));
|
||||
+ CPPUNIT_ASSERT_EQUAL(std::string("1-2.module_el8+6587+9879afr5"), std::string(advisoryPkgs[0].getEVRString()));
|
||||
+ //CPPUNIT_ASSERT(!g_strcmp0(advisoryPkgs[1].getNameString(), "test-perl-DBI"));
|
||||
|
||||
// When modules are setup but none are enabled all collections are not applicable - no enabled module
|
||||
libdnf::ModulePackageContainer * modules = dnf_sack_get_module_container(sack);
|
||||
@@ -84,15 +85,15 @@ void QueryTest::testQueryGetAdvisoryPkgs()
|
||||
query->getAdvisoryPkgs(HY_EQ, advisoryPkgs);
|
||||
CPPUNIT_ASSERT(advisoryPkgs.size() == 0);
|
||||
|
||||
- // When I enable a module from multiple collections that contain a present package I get them
|
||||
+ // When I enable a module with multiple collections I will receave advisory packages only for active context
|
||||
CPPUNIT_ASSERT(modules->enable("perl-DBI", "master", false));
|
||||
dnf_sack_filter_modules_v2(sack, modules, nullptr, tmpdir, nullptr, true, false, false);
|
||||
|
||||
advisoryPkgs.clear();
|
||||
query->getAdvisoryPkgs(HY_EQ, advisoryPkgs);
|
||||
- CPPUNIT_ASSERT(advisoryPkgs.size() == 2);
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(advisoryPkgs[0].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(advisoryPkgs[1].getNameString(), "test-perl-DBI"));
|
||||
+ CPPUNIT_ASSERT(advisoryPkgs.size() == 1);
|
||||
+ CPPUNIT_ASSERT_EQUAL(std::string("test-perl-DBI"), std::string(advisoryPkgs[0].getNameString()));
|
||||
+ CPPUNIT_ASSERT_EQUAL(std::string("1-2.module_el8+6587+9879afr5"), std::string(advisoryPkgs[0].getEVRString()));
|
||||
|
||||
delete query;
|
||||
}
|
||||
@@ -102,16 +103,13 @@ void QueryTest::testQueryFilterAdvisory()
|
||||
// When modules are not setup all advisory collections are applicable and there is no modular filtering
|
||||
HyQuery query = new libdnf::Query(sack);
|
||||
query->addFilter(HY_PKG_ADVISORY_TYPE, HY_EQ, "enhancement");
|
||||
- CPPUNIT_ASSERT(query->size() == 2);
|
||||
+ CPPUNIT_ASSERT(query->size() == 1);
|
||||
|
||||
// We get test-perl-DBI twice because its in two collections
|
||||
libdnf::PackageSet pset = *(query->getResultPset());
|
||||
DnfPackage *pkg = dnf_package_new(sack, pset[0]);
|
||||
CPPUNIT_ASSERT(!g_strcmp0(dnf_package_get_name(pkg), "test-perl-DBI"));
|
||||
g_object_unref(pkg);
|
||||
- pkg = dnf_package_new(sack, pset[1]);
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(dnf_package_get_name(pkg), "test-perl-DBI"));
|
||||
- g_object_unref(pkg);
|
||||
delete query;
|
||||
|
||||
// When module are setup but none are enabled all collections are not applicable - no enabled module
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,34 +0,0 @@
|
||||
From c7f0b13bf32cfba63a2db6257c50ae1ba5c8f9ba Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Mracek <jmracek@redhat.com>
|
||||
Date: Thu, 6 May 2021 11:18:20 +0200
|
||||
Subject: [PATCH 18/19] Adjust module error formatting function for original
|
||||
modular solver
|
||||
|
||||
The new solver uses libsolv solvable by another way. The revert requires
|
||||
also change in formatting function.
|
||||
---
|
||||
libdnf/goal/Goal.cpp | 8 ++------
|
||||
1 file changed, 2 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libdnf/goal/Goal.cpp b/libdnf/goal/Goal.cpp
|
||||
index a6f11a4f..6b2f91a2 100644
|
||||
--- a/libdnf/goal/Goal.cpp
|
||||
+++ b/libdnf/goal/Goal.cpp
|
||||
@@ -58,12 +58,8 @@ std::string moduleSolvid2str(Pool * pool, Id source)
|
||||
{
|
||||
std::ostringstream ss;
|
||||
auto * solvable = pool_id2solvable(pool, source);
|
||||
- // Add name:stream
|
||||
- ss << solvable_lookup_str(solvable, SOLVABLE_DESCRIPTION);
|
||||
- //Add version
|
||||
- ss << ":" << pool_id2str(pool, solvable->evr);
|
||||
- // Add original context
|
||||
- ss << ":" << solvable_lookup_str(solvable, SOLVABLE_SUMMARY);
|
||||
+ // Add name:stream:version:context
|
||||
+ ss << pool_id2str(pool, solvable->name);
|
||||
ss << "." << pool_id2str(pool, solvable->arch);
|
||||
return ss.str();
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,57 +0,0 @@
|
||||
From eb7217d0a71b92ac0d8c3773caa1a2d3a2c20071 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Mracek <jmracek@redhat.com>
|
||||
Date: Thu, 13 May 2021 09:10:42 +0200
|
||||
Subject: [PATCH 19/19] Remove redundant test
|
||||
|
||||
The test is identical to
|
||||
testGetApplicablePackagesMultipleApplicableCollections().
|
||||
---
|
||||
tests/libdnf/sack/AdvisoryTest.cpp | 11 -----------
|
||||
tests/libdnf/sack/AdvisoryTest.hpp | 2 --
|
||||
2 files changed, 13 deletions(-)
|
||||
|
||||
diff --git a/tests/libdnf/sack/AdvisoryTest.cpp b/tests/libdnf/sack/AdvisoryTest.cpp
|
||||
index 1abf1a95..f5892634 100644
|
||||
--- a/tests/libdnf/sack/AdvisoryTest.cpp
|
||||
+++ b/tests/libdnf/sack/AdvisoryTest.cpp
|
||||
@@ -91,17 +91,6 @@ void AdvisoryTest::testGetPackages()
|
||||
CPPUNIT_ASSERT(pkgsvector.size() == 4);
|
||||
}
|
||||
|
||||
-void AdvisoryTest::testGetApplicablePackagesModulesNotSetup()
|
||||
-{
|
||||
- std::vector<libdnf::AdvisoryPkg> pkgsvector;
|
||||
-
|
||||
- // When modules are not setup all advisory collections are applicable and we get all packages
|
||||
- advisory->getApplicablePackages(pkgsvector);
|
||||
- CPPUNIT_ASSERT_EQUAL(2, static_cast<int>(pkgsvector.size()));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[0].getNameString(), "test-perl-DBI"));
|
||||
- CPPUNIT_ASSERT(!g_strcmp0(pkgsvector[1].getNameString(), "not-present"));
|
||||
-}
|
||||
-
|
||||
void AdvisoryTest::testGetApplicablePackagesModulesSetupNoneEnabled()
|
||||
{
|
||||
std::vector<libdnf::AdvisoryPkg> pkgsvector;
|
||||
diff --git a/tests/libdnf/sack/AdvisoryTest.hpp b/tests/libdnf/sack/AdvisoryTest.hpp
|
||||
index 6eb25a57..cb0d8c05 100644
|
||||
--- a/tests/libdnf/sack/AdvisoryTest.hpp
|
||||
+++ b/tests/libdnf/sack/AdvisoryTest.hpp
|
||||
@@ -19,7 +19,6 @@ class AdvisoryTest : public CppUnit::TestCase
|
||||
CPPUNIT_TEST(testGetSeverity);
|
||||
CPPUNIT_TEST(testGetTitle);
|
||||
CPPUNIT_TEST(testGetPackages);
|
||||
- CPPUNIT_TEST(testGetApplicablePackagesModulesNotSetup);
|
||||
CPPUNIT_TEST(testGetApplicablePackagesModulesSetupNoneEnabled);
|
||||
CPPUNIT_TEST(testGetApplicablePackagesOneApplicableCollection);
|
||||
CPPUNIT_TEST(testGetApplicablePackagesMultipleApplicableCollections);
|
||||
@@ -38,7 +37,6 @@ public:
|
||||
void testGetSeverity();
|
||||
void testGetTitle();
|
||||
void testGetPackages();
|
||||
- void testGetApplicablePackagesModulesNotSetup();
|
||||
void testGetApplicablePackagesModulesSetupNoneEnabled();
|
||||
void testGetApplicablePackagesOneApplicableCollection();
|
||||
void testGetApplicablePackagesMultipleApplicableCollections();
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 4a8a3f410552c58dfafb384bb361c6e40bebff1d Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Wed, 21 Jul 2021 11:01:32 +0200
|
||||
Subject: [PATCH] Fix: dnf_context_module_install: memory leaks
|
||||
|
||||
---
|
||||
libdnf/dnf-context.cpp | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
||||
index 55af2b2..6cb0011 100644
|
||||
--- a/libdnf/dnf-context.cpp
|
||||
+++ b/libdnf/dnf-context.cpp
|
||||
@@ -3486,7 +3486,10 @@ dnf_context_module_install(DnfContext * context, const char ** module_specs, GEr
|
||||
}
|
||||
for (const auto &nevra : modpkg->getArtifacts()) {
|
||||
int epoch;
|
||||
- char *name, *version, *release, *arch;
|
||||
+ g_autofree char *name = nullptr;
|
||||
+ g_autofree char *version = nullptr;
|
||||
+ g_autofree char *release = nullptr;
|
||||
+ g_autofree char *arch = nullptr;
|
||||
if (hy_split_nevra(nevra.c_str(), &name, &epoch, &version, &release, &arch)) {
|
||||
// this really should never happen; unless the modular repodata is corrupted
|
||||
g_autofree char *errmsg = g_strdup_printf (_("Failed to parse module artifact NEVRA '%s'"), nevra.c_str());
|
||||
--
|
||||
libgit2 1.0.1
|
||||
|
||||
@ -1,91 +0,0 @@
|
||||
From 07416268889f95e1495fb3d7b856de1c502870ba Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Wed, 21 Jul 2021 11:15:50 +0200
|
||||
Subject: [PATCH] covscan: remove unused vars, mark private func static, return values
|
||||
|
||||
The `begin` and `end` variables were not used
|
||||
in `ModulePackageContainer::updateFailSafeData`. Removed.
|
||||
|
||||
The `checksum` in "utils.cpp" is a private (static) function.
|
||||
|
||||
Added check of return value of `dnf_copy_recursive` function in unit test.
|
||||
|
||||
In the `install` in the "goal-py.cpp" file:
|
||||
Explicitly ignores the return values of `hy_goal_install` and
|
||||
`hy_goal_install_optional`. The functions always return zero.
|
||||
Explicitly ignores the return values of `hy_goal_install_selector` and
|
||||
`hy_goal_install_selector_optional`. The `error` argument is used instead.
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 2 --
|
||||
libdnf/utils/utils.cpp | 2 +-
|
||||
python/hawkey/goal-py.cpp | 8 ++++----
|
||||
tests/libdnf/module/ModulePackageContainerTest.cpp | 3 ++-
|
||||
4 files changed, 7 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index c0ad126..efab497 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -1656,8 +1656,6 @@ void ModulePackageContainer::updateFailSafeData()
|
||||
if (pImpl->activatedModules) {
|
||||
std::vector<ModulePackage *> latest = pImpl->getLatestActiveEnabledModules();
|
||||
|
||||
- auto begin = fileNames.begin();
|
||||
- auto end = fileNames.end();
|
||||
if (g_mkdir_with_parents(pImpl->persistDir.c_str(), 0755) == -1) {
|
||||
const char * errTxt = strerror(errno);
|
||||
auto logger(Log::getLogger());
|
||||
diff --git a/libdnf/utils/utils.cpp b/libdnf/utils/utils.cpp
|
||||
index 450718d..15f5275 100644
|
||||
--- a/libdnf/utils/utils.cpp
|
||||
+++ b/libdnf/utils/utils.cpp
|
||||
@@ -301,7 +301,7 @@ void decompress(const char * inPath, const char * outPath, mode_t outMode, const
|
||||
fclose(inFile);
|
||||
}
|
||||
|
||||
-void checksum(const char * type, const char * inPath, const char * checksum_valid, bool * valid_out, gchar ** calculated_out)
|
||||
+static void checksum(const char * type, const char * inPath, const char * checksum_valid, bool * valid_out, gchar ** calculated_out)
|
||||
{
|
||||
GError * errP{nullptr};
|
||||
gboolean valid;
|
||||
diff --git a/python/hawkey/goal-py.cpp b/python/hawkey/goal-py.cpp
|
||||
index 2641a1d..5bbb959 100644
|
||||
--- a/python/hawkey/goal-py.cpp
|
||||
+++ b/python/hawkey/goal-py.cpp
|
||||
@@ -281,15 +281,15 @@ install(_GoalObject *self, PyObject *args, PyObject *kwds) try
|
||||
|
||||
if (flags & HY_WEAK_SOLV) {
|
||||
if (pkg) {
|
||||
- hy_goal_install_optional(self->goal, pkg);
|
||||
+ (void)hy_goal_install_optional(self->goal, pkg);
|
||||
} else {
|
||||
- hy_goal_install_selector_optional(self->goal, sltr, &error);
|
||||
+ (void)hy_goal_install_selector_optional(self->goal, sltr, &error);
|
||||
}
|
||||
} else {
|
||||
if (pkg) {
|
||||
- hy_goal_install(self->goal, pkg);
|
||||
+ (void)hy_goal_install(self->goal, pkg);
|
||||
} else {
|
||||
- hy_goal_install_selector(self->goal, sltr, &error);
|
||||
+ (void)hy_goal_install_selector(self->goal, sltr, &error);
|
||||
}
|
||||
}
|
||||
return op_error2exc(error);
|
||||
diff --git a/tests/libdnf/module/ModulePackageContainerTest.cpp b/tests/libdnf/module/ModulePackageContainerTest.cpp
|
||||
index b2cf170..6360a0c 100644
|
||||
--- a/tests/libdnf/module/ModulePackageContainerTest.cpp
|
||||
+++ b/tests/libdnf/module/ModulePackageContainerTest.cpp
|
||||
@@ -17,7 +17,8 @@ void ModulePackageContainerTest::setUp()
|
||||
char *retptr = mkdtemp(tmpdir);
|
||||
CPPUNIT_ASSERT(retptr);
|
||||
char * etc_target = g_strjoin(NULL, tmpdir, "/etc", NULL);
|
||||
- dnf_copy_recursive(TESTDATADIR "/modules/etc", etc_target, &error);
|
||||
+ auto ret = dnf_copy_recursive(TESTDATADIR "/modules/etc", etc_target, &error);
|
||||
+ g_assert_true(ret);
|
||||
g_assert_no_error(error);
|
||||
g_free(etc_target);
|
||||
|
||||
--
|
||||
libgit2 1.0.1
|
||||
|
||||
@ -1,32 +0,0 @@
|
||||
From 263eee36afc0ae5c8f342f4b61038e91ee942b21 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Blaha <mblaha@redhat.com>
|
||||
Date: Thu, 22 Apr 2021 15:19:26 +0200
|
||||
Subject: [PATCH] hawkey: surrogateescape error handler to decode UTF-8 strings (RhBug:1893176)
|
||||
|
||||
This ensures that libdnf does not raise UnicodeDecodeError when
|
||||
accessing package with non UTF-8 file names.
|
||||
|
||||
= changelog =
|
||||
msg: DNF does not fail on non UTF-8 file names in a package
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1893176
|
||||
---
|
||||
python/hawkey/iutil-py.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/python/hawkey/iutil-py.cpp b/python/hawkey/iutil-py.cpp
|
||||
index 56ccafd..57bef57 100644
|
||||
--- a/python/hawkey/iutil-py.cpp
|
||||
+++ b/python/hawkey/iutil-py.cpp
|
||||
@@ -285,7 +285,7 @@ strlist_to_pylist(const char **slist)
|
||||
return NULL;
|
||||
|
||||
for (const char **iter = slist; *iter; ++iter) {
|
||||
- UniquePtrPyObject str(PyUnicode_FromString(*iter));
|
||||
+ UniquePtrPyObject str(PyUnicode_DecodeUTF8(*iter, strlen(*iter), "surrogateescape"));
|
||||
if (!str)
|
||||
return NULL;
|
||||
int rc = PyList_Append(list.get(), str.get());
|
||||
--
|
||||
libgit2 1.0.1
|
||||
|
||||
@ -1,28 +0,0 @@
|
||||
From 6eb68174565ce0402cead9e45053b560e819e982 Mon Sep 17 00:00:00 2001
|
||||
From: Aleš Matěj <amatej@redhat.com>
|
||||
Date: Tue, 21 Sep 2021 12:10:49 +0200
|
||||
Subject: [PATCH] Turn off strict validation of modulemd documents (RhBug:2004853,2007166,2007167)
|
||||
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=2004853
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=2007166
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=2007167
|
||||
---
|
||||
libdnf/module/modulemd/ModuleMetadata.cpp | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdnf/module/modulemd/ModuleMetadata.cpp b/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
index fbdd8a1..9dcd661 100644
|
||||
--- a/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
+++ b/libdnf/module/modulemd/ModuleMetadata.cpp
|
||||
@@ -78,7 +78,7 @@ void ModuleMetadata::addMetadataFromString(const std::string & yaml, int priorit
|
||||
g_autoptr(GPtrArray) failures = NULL;
|
||||
|
||||
ModulemdModuleIndex * mi = modulemd_module_index_new();
|
||||
- gboolean success = modulemd_module_index_update_from_string(mi, yaml.c_str(), TRUE, &failures, &error);
|
||||
+ gboolean success = modulemd_module_index_update_from_string(mi, yaml.c_str(), FALSE, &failures, &error);
|
||||
if(!success){
|
||||
ModuleMetadata::reportFailures(failures);
|
||||
}
|
||||
--
|
||||
libgit2 1.0.1
|
||||
|
||||
@ -1,58 +0,0 @@
|
||||
From 551a83052ff92fa975f1015e2fc25b174f85b0e6 Mon Sep 17 00:00:00 2001
|
||||
From: Aleš Matěj <amatej@redhat.com>
|
||||
Date: Tue, 26 Oct 2021 09:33:51 +0200
|
||||
Subject: [PATCH] Add unittest for setting up repo with empty keyfile (RhBug:1994614)
|
||||
|
||||
The test ensures we don't crash when the keyfile is empty/not loaded.
|
||||
Test for: https://github.com/rpm-software-management/libdnf/commit/be66d0908d939ddaf3022c5489012bd1dbdb0075
|
||||
|
||||
RHEL bug:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1994614
|
||||
Fedora bug:
|
||||
https://bugzilla.redhat.com/show_bug.cgi?id=1946024
|
||||
---
|
||||
tests/libdnf/dnf-self-test.c | 21 +++++++++++++++++++++
|
||||
1 file changed, 21 insertions(+)
|
||||
|
||||
diff --git a/tests/libdnf/dnf-self-test.c b/tests/libdnf/dnf-self-test.c
|
||||
index 32a21e6..5295837 100644
|
||||
--- a/tests/libdnf/dnf-self-test.c
|
||||
+++ b/tests/libdnf/dnf-self-test.c
|
||||
@@ -199,6 +199,26 @@ ch_test_repo_func(void)
|
||||
g_object_unref(context);
|
||||
}
|
||||
|
||||
+static void
|
||||
+dnf_repo_setup_with_empty_keyfile(void)
|
||||
+{
|
||||
+ DnfContext *context = dnf_context_new();
|
||||
+ dnf_context_set_release_ver(context, "33");
|
||||
+ DnfRepo *repo = dnf_repo_new(context);
|
||||
+ GKeyFile *empty_key_file = g_key_file_new();
|
||||
+
|
||||
+ dnf_repo_set_keyfile(repo, empty_key_file);
|
||||
+
|
||||
+ GError *error = NULL;
|
||||
+ // Empty key file is not an errror, there is just no configuration to be loaded.
|
||||
+ g_assert(dnf_repo_setup(repo, &error));
|
||||
+ g_assert_no_error(error);
|
||||
+
|
||||
+ g_object_unref(repo);
|
||||
+ g_object_unref(context);
|
||||
+ g_key_file_free(empty_key_file);
|
||||
+}
|
||||
+
|
||||
static guint _allow_cancel_updates = 0;
|
||||
static guint _action_updates = 0;
|
||||
static guint _package_progress_updates = 0;
|
||||
@@ -1217,6 +1237,7 @@ main(int argc, char **argv)
|
||||
g_test_add_func("/libdnf/lock", dnf_lock_func);
|
||||
g_test_add_func("/libdnf/lock[threads]", dnf_lock_threads_func);
|
||||
g_test_add_func("/libdnf/repo", ch_test_repo_func);
|
||||
+ g_test_add_func("/libdnf/repo_empty_keyfile", dnf_repo_setup_with_empty_keyfile);
|
||||
g_test_add_func("/libdnf/state", dnf_state_func);
|
||||
g_test_add_func("/libdnf/state[child]", dnf_state_child_func);
|
||||
g_test_add_func("/libdnf/state[parent-1-step]", dnf_state_parent_one_step_proxy_func);
|
||||
--
|
||||
libgit2 1.1.0
|
||||
|
||||
@ -1,90 +0,0 @@
|
||||
From e83ff88f8e4604024e4d5f4fd9f2fa4e5d4f03f9 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Mracek <jmracek@redhat.com>
|
||||
Date: Tue, 23 Nov 2021 14:14:23 +0100
|
||||
Subject: [PATCH] Add getLatestModules()
|
||||
|
||||
It returns latest module packages for each module name, stream, and
|
||||
architecture.
|
||||
|
||||
It is an alternative implementation to code base with
|
||||
the old modular solver.
|
||||
|
||||
Alternative to 73868368120ceea97ada628a1aa42236fb42b89d
|
||||
---
|
||||
libdnf/module/ModulePackageContainer.cpp | 39 +++++++++++++++++++++++++++++++++++++++
|
||||
libdnf/module/ModulePackageContainer.hpp | 9 +++++++++
|
||||
2 files changed, 48 insertions(+)
|
||||
|
||||
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
||||
index efab497..f9f861c 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.cpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.cpp
|
||||
@@ -1037,6 +1037,45 @@ ModulePackageContainer::getLatestModulesPerRepo(ModuleState moduleFilter,
|
||||
return output;
|
||||
}
|
||||
|
||||
+std::vector<ModulePackage *>
|
||||
+ModulePackageContainer::getLatestModules(const std::vector<ModulePackage *> modulePackages, bool activeOnly)
|
||||
+{
|
||||
+ std::vector<ModulePackage *> latestModules;
|
||||
+ if (activeOnly) {
|
||||
+ // When no active module return
|
||||
+ if (!pImpl->activatedModules) {
|
||||
+ return latestModules;
|
||||
+ }
|
||||
+ }
|
||||
+ std::map<std::string, std::vector<ModulePackage *>> latest;
|
||||
+
|
||||
+ for (auto modulePackage : modulePackages) {
|
||||
+ if (activeOnly && !isModuleActive(modulePackage)) {
|
||||
+ continue;
|
||||
+ }
|
||||
+ auto nameStreamArch = modulePackage->getNameStream();
|
||||
+ nameStreamArch.append(":");
|
||||
+ nameStreamArch.append(modulePackage->getArchCStr());
|
||||
+ auto & entries = latest[nameStreamArch];
|
||||
+ if (entries.empty()) {
|
||||
+ entries.push_back(modulePackage);
|
||||
+ } else {
|
||||
+ auto version = (*entries.begin())->getVersionNum();
|
||||
+ if (version < modulePackage->getVersionNum()) {
|
||||
+ entries.clear();
|
||||
+ entries.push_back(modulePackage);
|
||||
+ } else if (version == modulePackage->getVersionNum()) {
|
||||
+ entries.push_back(modulePackage);
|
||||
+ }
|
||||
+ }
|
||||
+ }
|
||||
+ for (auto & entries : latest) {
|
||||
+ for (auto modulePackage : entries.second) {
|
||||
+ latestModules.push_back(modulePackage);
|
||||
+ }
|
||||
+ }
|
||||
+ return latestModules;
|
||||
+}
|
||||
|
||||
std::pair<std::vector<std::vector<std::string>>, ModulePackageContainer::ModuleErrorType>
|
||||
ModulePackageContainer::resolveActiveModulePackages(bool debugSolver)
|
||||
diff --git a/libdnf/module/ModulePackageContainer.hpp b/libdnf/module/ModulePackageContainer.hpp
|
||||
index 7e5071b..42d5a9e 100644
|
||||
--- a/libdnf/module/ModulePackageContainer.hpp
|
||||
+++ b/libdnf/module/ModulePackageContainer.hpp
|
||||
@@ -132,6 +132,15 @@ public:
|
||||
std::vector<std::vector<std::vector<ModulePackage *>>> getLatestModulesPerRepo(
|
||||
ModuleState moduleFilter, std::vector<ModulePackage *> modulePackages);
|
||||
|
||||
+ /**
|
||||
+ * @brief Return all latest ModulePackages for each module Name, stream and architecture. In case of
|
||||
+ * multiple latest packages, all will be returned. When activeOnly is true, it returns only the latest active
|
||||
+ * packages.
|
||||
+ *
|
||||
+ * @return std::vector<ModulePackage *>
|
||||
+ */
|
||||
+ std::vector<ModulePackage *> getLatestModules(const std::vector<ModulePackage *> modulePackages, bool activeOnly);
|
||||
+
|
||||
std::vector<ModulePackage *> requiresModuleEnablement(const libdnf::PackageSet & packages);
|
||||
|
||||
/**
|
||||
--
|
||||
libgit2 1.1.0
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
From 7d8f9cfcdf7725fef2c99ecb2dedcdff1e9506d7 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Wed, 13 Apr 2022 12:26:10 +0200
|
||||
Subject: [PATCH 26/34] context: Substitute all repository config options
|
||||
(RhBug:2076853)
|
||||
|
||||
It also solves the problem: Substitution of variables in `baseurl`
|
||||
does not work in microdnf and PackageKit unless `metalink` or `mirrorlist`
|
||||
is set at the same time.
|
||||
---
|
||||
libdnf/dnf-repo.cpp | 34 +++++++++++++++++++++++++---------
|
||||
1 file changed, 25 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp
|
||||
index 710045fb..9d42e3e3 100644
|
||||
--- a/libdnf/dnf-repo.cpp
|
||||
+++ b/libdnf/dnf-repo.cpp
|
||||
@@ -83,6 +83,7 @@ typedef struct
|
||||
LrHandle *repo_handle;
|
||||
LrResult *repo_result;
|
||||
LrUrlVars *urlvars;
|
||||
+ bool unit_test_mode; /* ugly hack for unit tests */
|
||||
} DnfRepoPrivate;
|
||||
|
||||
G_DEFINE_TYPE_WITH_PRIVATE(DnfRepo, dnf_repo, G_TYPE_OBJECT)
|
||||
@@ -847,8 +848,11 @@ dnf_repo_conf_reset(libdnf::ConfigRepo &config)
|
||||
|
||||
/* Loads repository configuration from GKeyFile */
|
||||
static void
|
||||
-dnf_repo_conf_from_gkeyfile(libdnf::ConfigRepo &config, const char *repoId, GKeyFile *gkeyFile)
|
||||
+dnf_repo_conf_from_gkeyfile(DnfRepo *repo, const char *repoId, GKeyFile *gkeyFile)
|
||||
{
|
||||
+ DnfRepoPrivate *priv = GET_PRIVATE(repo);
|
||||
+ auto & config = *priv->repo->getConfig();
|
||||
+
|
||||
// Reset to the initial state before reloading the configuration.
|
||||
dnf_repo_conf_reset(config);
|
||||
|
||||
@@ -883,20 +887,31 @@ dnf_repo_conf_from_gkeyfile(libdnf::ConfigRepo &config, const char *repoId, GKey
|
||||
// list can be ['value1', 'value2, value3'] therefore we first join
|
||||
// to have 'value1, value2, value3'
|
||||
g_autofree gchar * tmp_strval = g_strjoinv(",", list);
|
||||
+
|
||||
+ // Substitute vars.
|
||||
+ g_autofree gchar *subst_value = dnf_repo_substitute(repo, tmp_strval);
|
||||
+
|
||||
+ if (strcmp(key, "baseurl") == 0 && strstr(tmp_strval, "file://$testdatadir") != NULL) {
|
||||
+ priv->unit_test_mode = true;
|
||||
+ }
|
||||
+
|
||||
try {
|
||||
- optionItem.newString(libdnf::Option::Priority::REPOCONFIG, tmp_strval);
|
||||
+ optionItem.newString(libdnf::Option::Priority::REPOCONFIG, subst_value);
|
||||
} catch (const std::exception & ex) {
|
||||
- g_debug("Invalid configuration value: %s = %s in %s; %s", key, value.c_str(), repoId, ex.what());
|
||||
+ g_debug("Invalid configuration value: %s = %s in %s; %s", key, subst_value, repoId, ex.what());
|
||||
}
|
||||
}
|
||||
|
||||
} else {
|
||||
-
|
||||
// process other (non list) options
|
||||
+
|
||||
+ // Substitute vars.
|
||||
+ g_autofree gchar *subst_value = dnf_repo_substitute(repo, value.c_str());
|
||||
+
|
||||
try {
|
||||
- optionItem.newString(libdnf::Option::Priority::REPOCONFIG, value);
|
||||
+ optionItem.newString(libdnf::Option::Priority::REPOCONFIG, subst_value);
|
||||
} catch (const std::exception & ex) {
|
||||
- g_debug("Invalid configuration value: %s = %s in %s; %s", key, value.c_str(), repoId, ex.what());
|
||||
+ g_debug("Invalid configuration value: %s = %s in %s; %s", key, subst_value, repoId, ex.what());
|
||||
}
|
||||
|
||||
}
|
||||
@@ -950,7 +965,7 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, gboolean reloadFromGKeyFile, GError **e
|
||||
|
||||
// Reload repository configuration from keyfile.
|
||||
if (reloadFromGKeyFile) {
|
||||
- dnf_repo_conf_from_gkeyfile(*conf, repoId, priv->keyfile);
|
||||
+ dnf_repo_conf_from_gkeyfile(repo, repoId, priv->keyfile);
|
||||
dnf_repo_apply_setopts(*conf, repoId);
|
||||
}
|
||||
|
||||
@@ -996,8 +1011,9 @@ dnf_repo_set_keyfile_data(DnfRepo *repo, gboolean reloadFromGKeyFile, GError **e
|
||||
g_autofree gchar *url = NULL;
|
||||
url = lr_prepend_url_protocol(baseurls[0]);
|
||||
if (url != NULL && strncasecmp(url, "file://", 7) == 0) {
|
||||
- if (g_strstr_len(url, -1, "$testdatadir") == NULL)
|
||||
+ if (!priv->unit_test_mode) {
|
||||
priv->kind = DNF_REPO_KIND_LOCAL;
|
||||
+ }
|
||||
g_free(priv->location);
|
||||
g_free(priv->keyring);
|
||||
priv->location = dnf_repo_substitute(repo, url + 7);
|
||||
@@ -1224,7 +1240,7 @@ dnf_repo_setup(DnfRepo *repo, GError **error) try
|
||||
auto repoId = priv->repo->getId().c_str();
|
||||
|
||||
auto conf = priv->repo->getConfig();
|
||||
- dnf_repo_conf_from_gkeyfile(*conf, repoId, priv->keyfile);
|
||||
+ dnf_repo_conf_from_gkeyfile(repo, repoId, priv->keyfile);
|
||||
dnf_repo_apply_setopts(*conf, repoId);
|
||||
|
||||
auto sslverify = conf->sslverify().getValue();
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,50 +0,0 @@
|
||||
From 074ca4cf643c79b8ec3db89a7fd5580ba387eb4d Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Wed, 20 Apr 2022 08:22:30 +0200
|
||||
Subject: [PATCH 27/34] Use environment variable in unittest instead of ugly
|
||||
hack in libdnf
|
||||
|
||||
Libdnf contains hacks for unit tests. This removes one hack.
|
||||
---
|
||||
libdnf/dnf-repo.cpp | 3 ---
|
||||
tests/libdnf/dnf-self-test.c | 3 +++
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp
|
||||
index 9d42e3e3..c015d7fd 100644
|
||||
--- a/libdnf/dnf-repo.cpp
|
||||
+++ b/libdnf/dnf-repo.cpp
|
||||
@@ -1191,7 +1191,6 @@ dnf_repo_setup(DnfRepo *repo, GError **error) try
|
||||
DnfRepoEnabled enabled = DNF_REPO_ENABLED_NONE;
|
||||
g_autofree gchar *basearch = NULL;
|
||||
g_autofree gchar *release = NULL;
|
||||
- g_autofree gchar *testdatadir = NULL;
|
||||
|
||||
basearch = g_key_file_get_string(priv->keyfile, "general", "arch", NULL);
|
||||
if (basearch == NULL)
|
||||
@@ -1230,8 +1229,6 @@ dnf_repo_setup(DnfRepo *repo, GError **error) try
|
||||
for (const auto & item : libdnf::dnf_context_get_vars(priv->context))
|
||||
priv->urlvars = lr_urlvars_set(priv->urlvars, item.first.c_str(), item.second.c_str());
|
||||
|
||||
- testdatadir = dnf_realpath(TESTDATADIR);
|
||||
- priv->urlvars = lr_urlvars_set(priv->urlvars, "testdatadir", testdatadir);
|
||||
if (!lr_handle_setopt(priv->repo_handle, error, LRO_VARSUB, priv->urlvars))
|
||||
return FALSE;
|
||||
if (!lr_handle_setopt(priv->repo_handle, error, LRO_GNUPGHOMEDIR, priv->keyring))
|
||||
diff --git a/tests/libdnf/dnf-self-test.c b/tests/libdnf/dnf-self-test.c
|
||||
index 52958371..906f0e21 100644
|
||||
--- a/tests/libdnf/dnf-self-test.c
|
||||
+++ b/tests/libdnf/dnf-self-test.c
|
||||
@@ -1225,6 +1225,9 @@ main(int argc, char **argv)
|
||||
g_log_set_fatal_mask(NULL, G_LOG_LEVEL_ERROR | G_LOG_LEVEL_CRITICAL);
|
||||
g_log_set_always_fatal (G_LOG_FATAL_MASK);
|
||||
|
||||
+ /* Sets a variable to replace in repository configurations. */
|
||||
+ g_setenv("DNF_VAR_testdatadir", TESTDATADIR, TRUE);
|
||||
+
|
||||
/* tests go here */
|
||||
g_test_add_func("/libdnf/repo_loader{gpg-asc}", dnf_repo_loader_gpg_asc_func);
|
||||
g_test_add_func("/libdnf/repo_loader{gpg-wrong-asc}", dnf_repo_loader_gpg_wrong_asc_func);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,169 +0,0 @@
|
||||
From 983aeea57d75494fd4ea2ff2903f966136278c15 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Wed, 9 Feb 2022 13:17:00 +0100
|
||||
Subject: [PATCH 28/34] Add private API for filling, reading and verifying new
|
||||
dnf solv userdata
|
||||
|
||||
---
|
||||
libdnf/hy-iutil-private.hpp | 24 +++++++++
|
||||
libdnf/hy-iutil.cpp | 102 ++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 126 insertions(+)
|
||||
|
||||
diff --git a/libdnf/hy-iutil-private.hpp b/libdnf/hy-iutil-private.hpp
|
||||
index e07b1b51..d498c032 100644
|
||||
--- a/libdnf/hy-iutil-private.hpp
|
||||
+++ b/libdnf/hy-iutil-private.hpp
|
||||
@@ -24,6 +24,30 @@
|
||||
#include "hy-iutil.h"
|
||||
#include "hy-types.h"
|
||||
#include "sack/packageset.hpp"
|
||||
+#include <array>
|
||||
+#include <utility>
|
||||
+
|
||||
+// Use 8 bytes for libsolv version (API: solv_toolversion)
|
||||
+// to be future proof even though it currently is "1.2"
|
||||
+static constexpr const size_t solv_userdata_solv_toolversion_size{8};
|
||||
+static constexpr const std::array<char, 4> solv_userdata_magic{'\0', 'd', 'n', 'f'};
|
||||
+static constexpr const std::array<char, 4> solv_userdata_dnf_version{'\0', '1', '.', '0'};
|
||||
+
|
||||
+static constexpr const int solv_userdata_size = solv_userdata_solv_toolversion_size + \
|
||||
+ solv_userdata_magic.size() + \
|
||||
+ solv_userdata_dnf_version.size() + \
|
||||
+ CHKSUM_BYTES;
|
||||
+
|
||||
+struct SolvUserdata {
|
||||
+ char dnf_magic[solv_userdata_magic.size()];
|
||||
+ char dnf_version[solv_userdata_dnf_version.size()];
|
||||
+ char libsolv_version[solv_userdata_solv_toolversion_size];
|
||||
+ unsigned char checksum[CHKSUM_BYTES];
|
||||
+}__attribute__((packed)); ;
|
||||
+
|
||||
+int solv_userdata_fill(SolvUserdata *solv_userdata, const unsigned char *checksum, GError** error);
|
||||
+std::unique_ptr<SolvUserdata> solv_userdata_read(FILE *fp);
|
||||
+int solv_userdata_verify(const SolvUserdata *solv_userdata, const unsigned char *checksum);
|
||||
|
||||
/* crypto utils */
|
||||
int checksum_cmp(const unsigned char *cs1, const unsigned char *cs2);
|
||||
diff --git a/libdnf/hy-iutil.cpp b/libdnf/hy-iutil.cpp
|
||||
index 2af13197..f81ca52f 100644
|
||||
--- a/libdnf/hy-iutil.cpp
|
||||
+++ b/libdnf/hy-iutil.cpp
|
||||
@@ -43,6 +43,7 @@ extern "C" {
|
||||
#include <solv/evr.h>
|
||||
#include <solv/solver.h>
|
||||
#include <solv/solverdebug.h>
|
||||
+#include <solv/repo_solv.h>
|
||||
#include <solv/util.h>
|
||||
#include <solv/pool_parserpmrichdep.h>
|
||||
}
|
||||
@@ -182,6 +183,107 @@ int checksum_write(const unsigned char *cs, FILE *fp)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static std::array<char, solv_userdata_solv_toolversion_size>
|
||||
+get_padded_solv_toolversion()
|
||||
+{
|
||||
+ std::array<char, solv_userdata_solv_toolversion_size> padded_solv_toolversion{};
|
||||
+ std::string solv_ver_str{solv_toolversion};
|
||||
+ std::copy(solv_ver_str.rbegin(), solv_ver_str.rend(), padded_solv_toolversion.rbegin());
|
||||
+
|
||||
+ return padded_solv_toolversion;
|
||||
+}
|
||||
+
|
||||
+int
|
||||
+solv_userdata_fill(SolvUserdata *solv_userdata, const unsigned char *checksum, GError** error)
|
||||
+{
|
||||
+ if (strlen(solv_toolversion) > solv_userdata_solv_toolversion_size) {
|
||||
+ g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("Libsolv's solv_toolversion is: %zu long but we expect max of: %zu"),
|
||||
+ strlen(solv_toolversion), solv_userdata_solv_toolversion_size);
|
||||
+ return 1;
|
||||
+ }
|
||||
+
|
||||
+ // copy dnf solv file magic
|
||||
+ memcpy(solv_userdata->dnf_magic, solv_userdata_magic.data(), solv_userdata_magic.size());
|
||||
+
|
||||
+ // copy dnf solv file version
|
||||
+ memcpy(solv_userdata->dnf_version, solv_userdata_dnf_version.data(), solv_userdata_dnf_version.size());
|
||||
+
|
||||
+ // copy libsolv solv file version
|
||||
+ memcpy(solv_userdata->libsolv_version, get_padded_solv_toolversion().data(), solv_userdata_solv_toolversion_size);
|
||||
+
|
||||
+ // copy checksum
|
||||
+ memcpy(solv_userdata->checksum, checksum, CHKSUM_BYTES);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+std::unique_ptr<SolvUserdata>
|
||||
+solv_userdata_read(FILE *fp)
|
||||
+{
|
||||
+ unsigned char *dnf_solvfile_userdata_read = NULL;
|
||||
+ int dnf_solvfile_userdata_len_read;
|
||||
+ if (!fp) {
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+
|
||||
+ int ret_code = solv_read_userdata(fp, &dnf_solvfile_userdata_read, &dnf_solvfile_userdata_len_read);
|
||||
+ // The userdata layout has to match our struct exactly so we can just cast the memory
|
||||
+ // allocated by libsolv
|
||||
+ std::unique_ptr<SolvUserdata> uniq_userdata(reinterpret_cast<SolvUserdata *>(dnf_solvfile_userdata_read));
|
||||
+ if(ret_code) {
|
||||
+ g_warning("Failed to read solv userdata: solv_read_userdata returned: %i", ret_code);
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+
|
||||
+ if (dnf_solvfile_userdata_len_read != solv_userdata_size) {
|
||||
+ g_warning("Solv userdata length mismatch, read: %i vs expected: %i",
|
||||
+ dnf_solvfile_userdata_len_read, solv_userdata_size);
|
||||
+ return nullptr;
|
||||
+ }
|
||||
+
|
||||
+ return uniq_userdata;
|
||||
+}
|
||||
+
|
||||
+gboolean
|
||||
+solv_userdata_verify(const SolvUserdata *solv_userdata, const unsigned char *checksum)
|
||||
+{
|
||||
+ // check dnf solvfile magic bytes
|
||||
+ if (memcmp(solv_userdata->dnf_magic, solv_userdata_magic.data(), solv_userdata_magic.size()) != 0) {
|
||||
+ // This is not dnf header do not read after it
|
||||
+ g_warning("magic bytes don't match, read: %s vs. dnf solvfile magic: %s",
|
||||
+ solv_userdata->dnf_magic, solv_userdata_magic.data());
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ // check dnf solvfile version
|
||||
+ if (memcmp(solv_userdata->dnf_version, solv_userdata_dnf_version.data(), solv_userdata_dnf_version.size()) != 0) {
|
||||
+ // Mismatching dnf solvfile version -> we need to regenerate
|
||||
+ g_warning("dnf solvfile version doesn't match, read: %s vs. dnf solvfile version: %s",
|
||||
+ solv_userdata->dnf_version, solv_userdata_dnf_version.data());
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ // check libsolv solvfile version
|
||||
+ if (memcmp(solv_userdata->libsolv_version, get_padded_solv_toolversion().data(), solv_userdata_solv_toolversion_size) != 0) {
|
||||
+ // Mismatching libsolv solvfile version -> we need to regenerate
|
||||
+ g_warning("libsolv solvfile version doesn't match, read: %s vs. libsolv version: %s",
|
||||
+ solv_userdata->libsolv_version, solv_toolversion);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ // check solvfile checksum
|
||||
+ if (checksum_cmp(solv_userdata->checksum, checksum)) {
|
||||
+ // Mismatching solvfile checksum -> we need to regenerate
|
||||
+ g_debug("solvfile checksum doesn't match, read: %s vs. repomd checksum: %s",
|
||||
+ solv_userdata->checksum, checksum);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
int
|
||||
checksum_type2length(int type)
|
||||
{
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,417 +0,0 @@
|
||||
From 465a6a59279bd7fa2680c626ca0f10c059276668 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Wed, 9 Feb 2022 13:18:41 +0100
|
||||
Subject: [PATCH 29/34] Use dnf solv userdata to check versions and checksum
|
||||
(RhBug:2027445)
|
||||
|
||||
Remove unused functions for checksums
|
||||
|
||||
= changelog =
|
||||
msg: Write and check versions and checksums for solvfile cache by using new dnf solvfile userdata (RhBug:2027445)
|
||||
It is not possible to use old cache files, therefore cache regeneration is triggered automatically.
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2027445
|
||||
---
|
||||
libdnf/dnf-sack.cpp | 254 ++++++++++++++++++++++--------------
|
||||
libdnf/hy-iutil-private.hpp | 2 -
|
||||
libdnf/hy-iutil.cpp | 20 ---
|
||||
3 files changed, 156 insertions(+), 120 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-sack.cpp b/libdnf/dnf-sack.cpp
|
||||
index b9baeaef..61f4807c 100644
|
||||
--- a/libdnf/dnf-sack.cpp
|
||||
+++ b/libdnf/dnf-sack.cpp
|
||||
@@ -225,17 +225,39 @@ dnf_sack_new(void)
|
||||
return DNF_SACK(g_object_new(DNF_TYPE_SACK, NULL));
|
||||
}
|
||||
|
||||
-static int
|
||||
-can_use_repomd_cache(FILE *fp_solv, unsigned char cs_repomd[CHKSUM_BYTES])
|
||||
-{
|
||||
- unsigned char cs_cache[CHKSUM_BYTES];
|
||||
-
|
||||
- if (fp_solv &&
|
||||
- !checksum_read(cs_cache, fp_solv) &&
|
||||
- !checksum_cmp(cs_cache, cs_repomd))
|
||||
- return 1;
|
||||
+// Try to load cached solv file into repo otherwise return FALSE
|
||||
+static gboolean
|
||||
+try_to_use_cached_solvfile(const char *path, Repo *repo, int flags, const unsigned char *checksum, GError **err){
|
||||
+ FILE *fp_cache = fopen(path, "r");
|
||||
+ if (!fp_cache) {
|
||||
+ // Missing cache files (ENOENT) are not an error and can even be expected in some cases
|
||||
+ // (such as when repo doesn't have updateinfo/prestodelta metadata).
|
||||
+ // Use g_debug in order not to pollute the log by default with such entries.
|
||||
+ if (errno == ENOENT) {
|
||||
+ g_debug("Failed to open solvfile cache: %s: %s", path, strerror(errno));
|
||||
+ } else {
|
||||
+ g_warning("Failed to open solvfile cache: %s: %s", path, strerror(errno));
|
||||
+ }
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+ std::unique_ptr<SolvUserdata> solv_userdata = solv_userdata_read(fp_cache);
|
||||
+ gboolean ret = TRUE;
|
||||
+ if (solv_userdata && solv_userdata_verify(solv_userdata.get(), checksum)) {
|
||||
+ // after reading the header rewind to the begining
|
||||
+ fseek(fp_cache, 0, SEEK_SET);
|
||||
+ if (repo_add_solv(repo, fp_cache, flags)) {
|
||||
+ g_set_error (err,
|
||||
+ DNF_ERROR,
|
||||
+ DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("repo_add_solv() has failed."));
|
||||
+ ret = FALSE;
|
||||
+ }
|
||||
+ } else {
|
||||
+ ret = FALSE;
|
||||
+ }
|
||||
|
||||
- return 0;
|
||||
+ fclose(fp_cache);
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
void
|
||||
@@ -375,33 +397,27 @@ load_ext(DnfSack *sack, HyRepo hrepo, _hy_repo_repodata which_repodata,
|
||||
gboolean done = FALSE;
|
||||
|
||||
char *fn_cache = dnf_sack_give_cache_fn(sack, name, suffix);
|
||||
- fp = fopen(fn_cache, "r");
|
||||
assert(libdnf::repoGetImpl(hrepo)->checksum);
|
||||
- if (can_use_repomd_cache(fp, libdnf::repoGetImpl(hrepo)->checksum)) {
|
||||
- int flags = 0;
|
||||
- /* the updateinfo is not a real extension */
|
||||
- if (which_repodata != _HY_REPODATA_UPDATEINFO)
|
||||
- flags |= REPO_EXTEND_SOLVABLES;
|
||||
- /* do not pollute the main pool with directory component ids */
|
||||
- if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER)
|
||||
- flags |= REPO_LOCALPOOL;
|
||||
- done = TRUE;
|
||||
+
|
||||
+ int flags = 0;
|
||||
+ /* the updateinfo is not a real extension */
|
||||
+ if (which_repodata != _HY_REPODATA_UPDATEINFO)
|
||||
+ flags |= REPO_EXTEND_SOLVABLES;
|
||||
+ /* do not pollute the main pool with directory component ids */
|
||||
+ if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER)
|
||||
+ flags |= REPO_LOCALPOOL;
|
||||
+ if (try_to_use_cached_solvfile(fn_cache, repo, flags, libdnf::repoGetImpl(hrepo)->checksum, error)) {
|
||||
g_debug("%s: using cache file: %s", __func__, fn_cache);
|
||||
- ret = repo_add_solv(repo, fp, flags);
|
||||
- if (ret) {
|
||||
- g_set_error_literal (error,
|
||||
- DNF_ERROR,
|
||||
- DNF_ERROR_INTERNAL_ERROR,
|
||||
- _("failed to add solv"));
|
||||
- return FALSE;
|
||||
- } else {
|
||||
- repo_update_state(hrepo, which_repodata, _HY_LOADED_CACHE);
|
||||
- repo_set_repodata(hrepo, which_repodata, repo->nrepodata - 1);
|
||||
- }
|
||||
+ done = TRUE;
|
||||
+ repo_update_state(hrepo, which_repodata, _HY_LOADED_CACHE);
|
||||
+ repo_set_repodata(hrepo, which_repodata, repo->nrepodata - 1);
|
||||
}
|
||||
+ if (error && *error) {
|
||||
+ g_prefix_error(error, _("Loading extension cache %s (%d) failed: "), fn_cache, which_repodata);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
g_free(fn_cache);
|
||||
- if (fp)
|
||||
- fclose(fp);
|
||||
if (done)
|
||||
return TRUE;
|
||||
|
||||
@@ -514,35 +530,53 @@ write_main(DnfSack *sack, HyRepo hrepo, int switchtosolv, GError **error)
|
||||
strerror(errno));
|
||||
goto done;
|
||||
}
|
||||
- rc = repo_write(repo, fp);
|
||||
- rc |= checksum_write(repoImpl->checksum, fp);
|
||||
- rc |= fclose(fp);
|
||||
+
|
||||
+ SolvUserdata solv_userdata;
|
||||
+ if (solv_userdata_fill(&solv_userdata, repoImpl->checksum, error)) {
|
||||
+ ret = FALSE;
|
||||
+ fclose(fp);
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ Repowriter *writer = repowriter_create(repo);
|
||||
+ repowriter_set_userdata(writer, &solv_userdata, solv_userdata_size);
|
||||
+ rc = repowriter_write(writer, fp);
|
||||
+ repowriter_free(writer);
|
||||
if (rc) {
|
||||
+ ret = FALSE;
|
||||
+ fclose(fp);
|
||||
+ g_set_error(error,
|
||||
+ DNF_ERROR,
|
||||
+ DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("While writing primary cache %s repowriter write failed: %i, error: %s"),
|
||||
+ tmp_fn_templ, rc, pool_errstr(repo->pool));
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ if (fclose(fp)) {
|
||||
ret = FALSE;
|
||||
g_set_error (error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_FILE_INVALID,
|
||||
- _("write_main() failed writing data: %i"), rc);
|
||||
+ _("Failed closing tmp file %s: %s"),
|
||||
+ tmp_fn_templ, strerror(errno));
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
if (switchtosolv && repo_is_one_piece(repo)) {
|
||||
+ repo_empty(repo, 1);
|
||||
/* switch over to written solv file activate paging */
|
||||
- FILE *fp = fopen(tmp_fn_templ, "r");
|
||||
- if (fp) {
|
||||
- repo_empty(repo, 1);
|
||||
- rc = repo_add_solv(repo, fp, 0);
|
||||
- fclose(fp);
|
||||
- if (rc) {
|
||||
- /* this is pretty fatal */
|
||||
- ret = FALSE;
|
||||
- g_set_error_literal (error,
|
||||
- DNF_ERROR,
|
||||
- DNF_ERROR_FILE_INVALID,
|
||||
- _("write_main() failed to re-load "
|
||||
- "written solv file"));
|
||||
- goto done;
|
||||
- }
|
||||
+ gboolean loaded = try_to_use_cached_solvfile(tmp_fn_templ, repo, 0, repoImpl->checksum, error);
|
||||
+ if (error && *error) {
|
||||
+ g_prefix_error(error, _("Failed to use newly written primary cache: %s: "), tmp_fn_templ);
|
||||
+ ret = FALSE;
|
||||
+ goto done;
|
||||
+ }
|
||||
+ if (!loaded) {
|
||||
+ g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("Failed to use newly written primary cache: %s"), tmp_fn_templ);
|
||||
+ ret = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -569,20 +603,6 @@ write_ext_updateinfo_filter(Repo *repo, Repokey *key, void *kfdata)
|
||||
return repo_write_stdkeyfilter(repo, key, 0);
|
||||
}
|
||||
|
||||
-static int
|
||||
-write_ext_updateinfo(HyRepo hrepo, Repodata *data, FILE *fp)
|
||||
-{
|
||||
- auto repoImpl = libdnf::repoGetImpl(hrepo);
|
||||
- Repo *repo = repoImpl->libsolvRepo;
|
||||
- int oldstart = repo->start;
|
||||
- repo->start = repoImpl->main_end;
|
||||
- repo->nsolvables -= repoImpl->main_nsolvables;
|
||||
- int res = repo_write_filtered(repo, fp, write_ext_updateinfo_filter, data, 0);
|
||||
- repo->start = oldstart;
|
||||
- repo->nsolvables += repoImpl->main_nsolvables;
|
||||
- return res;
|
||||
-}
|
||||
-
|
||||
static gboolean
|
||||
write_ext(DnfSack *sack, HyRepo hrepo, _hy_repo_repodata which_repodata,
|
||||
const char *suffix, GError **error)
|
||||
@@ -611,37 +631,78 @@ write_ext(DnfSack *sack, HyRepo hrepo, _hy_repo_repodata which_repodata,
|
||||
FILE *fp = fdopen(tmp_fd, "w+");
|
||||
|
||||
g_debug("%s: storing %s to: %s", __func__, repo->name, tmp_fn_templ);
|
||||
- if (which_repodata != _HY_REPODATA_UPDATEINFO)
|
||||
- ret |= repodata_write(data, fp);
|
||||
- else
|
||||
- ret |= write_ext_updateinfo(hrepo, data, fp);
|
||||
- ret |= checksum_write(repoImpl->checksum, fp);
|
||||
- ret |= fclose(fp);
|
||||
+
|
||||
+ SolvUserdata solv_userdata;
|
||||
+ if (solv_userdata_fill(&solv_userdata, repoImpl->checksum, error)) {
|
||||
+ fclose(fp);
|
||||
+ success = FALSE;
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ Repowriter *writer = repowriter_create(repo);
|
||||
+ repowriter_set_userdata(writer, &solv_userdata, solv_userdata_size);
|
||||
+ if (which_repodata != _HY_REPODATA_UPDATEINFO) {
|
||||
+ repowriter_set_repodatarange(writer, data->repodataid, data->repodataid + 1);
|
||||
+ repowriter_set_flags(writer, REPOWRITER_NO_STORAGE_SOLVABLE);
|
||||
+ ret = repowriter_write(writer, fp);
|
||||
+ } else {
|
||||
+ // write only updateinfo repodata
|
||||
+ int oldstart = repo->start;
|
||||
+ repo->start = repoImpl->main_end;
|
||||
+ repo->nsolvables -= repoImpl->main_nsolvables;
|
||||
+ repowriter_set_flags(writer, REPOWRITER_LEGACY);
|
||||
+ repowriter_set_keyfilter(writer, write_ext_updateinfo_filter, data);
|
||||
+ repowriter_set_keyqueue(writer, 0);
|
||||
+ ret = repowriter_write(writer, fp);
|
||||
+ repo->start = oldstart;
|
||||
+ repo->nsolvables += repoImpl->main_nsolvables;
|
||||
+ }
|
||||
+ repowriter_free(writer);
|
||||
if (ret) {
|
||||
+ success = FALSE;
|
||||
+ fclose(fp);
|
||||
+ g_set_error (error,
|
||||
+ DNF_ERROR,
|
||||
+ DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("While writing extension cache %s (%d): repowriter write failed: %i, error: %s"),
|
||||
+ tmp_fn_templ, which_repodata, ret, pool_errstr(repo->pool));
|
||||
+ goto done;
|
||||
+ }
|
||||
+
|
||||
+ if (fclose(fp)) {
|
||||
success = FALSE;
|
||||
g_set_error (error,
|
||||
DNF_ERROR,
|
||||
- DNF_ERROR_FAILED,
|
||||
- _("write_ext(%1$d) has failed: %2$d"),
|
||||
- which_repodata, ret);
|
||||
+ DNF_ERROR_FILE_INVALID,
|
||||
+ _("While writing extension cache (%d): cannot close temporary file: %s"),
|
||||
+ which_repodata, tmp_fn_templ);
|
||||
goto done;
|
||||
}
|
||||
}
|
||||
|
||||
if (repo_is_one_piece(repo) && which_repodata != _HY_REPODATA_UPDATEINFO) {
|
||||
/* switch over to written solv file activate paging */
|
||||
- FILE *fp = fopen(tmp_fn_templ, "r");
|
||||
- if (fp) {
|
||||
- int flags = REPO_USE_LOADING | REPO_EXTEND_SOLVABLES;
|
||||
- /* do not pollute the main pool with directory component ids */
|
||||
- if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER)
|
||||
- flags |= REPO_LOCALPOOL;
|
||||
- repodata_extend_block(data, repo->start, repo->end - repo->start);
|
||||
- data->state = REPODATA_LOADING;
|
||||
- repo_add_solv(repo, fp, flags);
|
||||
- data->state = REPODATA_AVAILABLE;
|
||||
- fclose(fp);
|
||||
+ int flags = REPO_USE_LOADING | REPO_EXTEND_SOLVABLES;
|
||||
+ /* do not pollute the main pool with directory component ids */
|
||||
+ if (which_repodata == _HY_REPODATA_FILENAMES || which_repodata == _HY_REPODATA_OTHER)
|
||||
+ flags |= REPO_LOCALPOOL;
|
||||
+ repodata_extend_block(data, repo->start, repo->end - repo->start);
|
||||
+ data->state = REPODATA_LOADING;
|
||||
+ int loaded = try_to_use_cached_solvfile(tmp_fn_templ, repo, flags, repoImpl->checksum, error);
|
||||
+ if (error && *error) {
|
||||
+ g_prefix_error(error, _("Failed to use newly written extension cache: %s (%d): "),
|
||||
+ tmp_fn_templ, which_repodata);
|
||||
+ success = FALSE;
|
||||
+ goto done;
|
||||
+ }
|
||||
+ if (!loaded) {
|
||||
+ g_set_error(error, DNF_ERROR, DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("Failed to use newly written extension cache: %s (%d)"), tmp_fn_templ, which_repodata);
|
||||
+ success = FALSE;
|
||||
+ goto done;
|
||||
}
|
||||
+
|
||||
+ data->state = REPODATA_AVAILABLE;
|
||||
}
|
||||
|
||||
if (!mv(tmp_fn_templ, fn, error)) {
|
||||
@@ -672,7 +733,7 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error)
|
||||
|
||||
FILE *fp_primary = NULL;
|
||||
FILE *fp_repomd = NULL;
|
||||
- FILE *fp_cache = fopen(fn_cache, "r");
|
||||
+
|
||||
if (!fn_repomd) {
|
||||
g_set_error (error,
|
||||
DNF_ERROR,
|
||||
@@ -693,18 +754,17 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error)
|
||||
}
|
||||
checksum_fp(repoImpl->checksum, fp_repomd);
|
||||
|
||||
- if (can_use_repomd_cache(fp_cache, repoImpl->checksum)) {
|
||||
+ if (try_to_use_cached_solvfile(fn_cache, repo, 0, repoImpl->checksum, error)) {
|
||||
const char *chksum = pool_checksum_str(pool, repoImpl->checksum);
|
||||
g_debug("using cached %s (0x%s)", name, chksum);
|
||||
- if (repo_add_solv(repo, fp_cache, 0)) {
|
||||
- g_set_error (error,
|
||||
- DNF_ERROR,
|
||||
- DNF_ERROR_INTERNAL_ERROR,
|
||||
- _("repo_add_solv() has failed."));
|
||||
- retval = FALSE;
|
||||
- goto out;
|
||||
- }
|
||||
repoImpl->state_main = _HY_LOADED_CACHE;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ if (error && *error) {
|
||||
+ g_prefix_error(error, _("While loading repository failed to use %s: "), fn_cache);
|
||||
+ retval = FALSE;
|
||||
+ goto out;
|
||||
} else {
|
||||
auto primary = hrepo->getMetadataPath(MD_TYPE_PRIMARY);
|
||||
if (primary.empty()) {
|
||||
@@ -733,8 +793,6 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error)
|
||||
repoImpl->state_main = _HY_LOADED_FETCH;
|
||||
}
|
||||
out:
|
||||
- if (fp_cache)
|
||||
- fclose(fp_cache);
|
||||
if (fp_repomd)
|
||||
fclose(fp_repomd);
|
||||
if (fp_primary)
|
||||
diff --git a/libdnf/hy-iutil-private.hpp b/libdnf/hy-iutil-private.hpp
|
||||
index d498c032..efc91c63 100644
|
||||
--- a/libdnf/hy-iutil-private.hpp
|
||||
+++ b/libdnf/hy-iutil-private.hpp
|
||||
@@ -52,9 +52,7 @@ int solv_userdata_verify(const SolvUserdata *solv_userdata, const unsigned char
|
||||
/* crypto utils */
|
||||
int checksum_cmp(const unsigned char *cs1, const unsigned char *cs2);
|
||||
int checksum_fp(unsigned char *out, FILE *fp);
|
||||
-int checksum_read(unsigned char *csout, FILE *fp);
|
||||
int checksum_stat(unsigned char *out, FILE *fp);
|
||||
-int checksum_write(const unsigned char *cs, FILE *fp);
|
||||
int checksumt_l2h(int type);
|
||||
const char *pool_checksum_str(Pool *pool, const unsigned char *chksum);
|
||||
|
||||
diff --git a/libdnf/hy-iutil.cpp b/libdnf/hy-iutil.cpp
|
||||
index f81ca52f..c409a10a 100644
|
||||
--- a/libdnf/hy-iutil.cpp
|
||||
+++ b/libdnf/hy-iutil.cpp
|
||||
@@ -142,17 +142,6 @@ checksum_fp(unsigned char *out, FILE *fp)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-/* calls rewind(fp) before returning */
|
||||
-int
|
||||
-checksum_read(unsigned char *csout, FILE *fp)
|
||||
-{
|
||||
- if (fseek(fp, -32, SEEK_END) ||
|
||||
- fread(csout, CHKSUM_BYTES, 1, fp) != 1)
|
||||
- return 1;
|
||||
- rewind(fp);
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
/* does not move the fp position */
|
||||
int
|
||||
checksum_stat(unsigned char *out, FILE *fp)
|
||||
@@ -174,15 +163,6 @@ checksum_stat(unsigned char *out, FILE *fp)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-/* moves fp to the end of file */
|
||||
-int checksum_write(const unsigned char *cs, FILE *fp)
|
||||
-{
|
||||
- if (fseek(fp, 0, SEEK_END) ||
|
||||
- fwrite(cs, CHKSUM_BYTES, 1, fp) != 1)
|
||||
- return 1;
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
static std::array<char, solv_userdata_solv_toolversion_size>
|
||||
get_padded_solv_toolversion()
|
||||
{
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,83 +0,0 @@
|
||||
From 1e0f8f66f6ff30e177c41be7d72330d5eccf2ff8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Wed, 9 Feb 2022 13:24:06 +0100
|
||||
Subject: [PATCH 30/34] Update unittest to test the new private dnf solvfile
|
||||
API
|
||||
|
||||
---
|
||||
tests/hawkey/test_iutil.cpp | 34 ++++++++++++++++++++++------------
|
||||
1 file changed, 22 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/tests/hawkey/test_iutil.cpp b/tests/hawkey/test_iutil.cpp
|
||||
index 8d00cc94..f3c04782 100644
|
||||
--- a/tests/hawkey/test_iutil.cpp
|
||||
+++ b/tests/hawkey/test_iutil.cpp
|
||||
@@ -24,6 +24,8 @@
|
||||
|
||||
|
||||
#include <solv/pool.h>
|
||||
+#include <solv/repo.h>
|
||||
+#include <solv/repo_write.h>
|
||||
|
||||
|
||||
#include "libdnf/hy-util.h"
|
||||
@@ -97,28 +99,36 @@ START_TEST(test_checksum)
|
||||
}
|
||||
END_TEST
|
||||
|
||||
-START_TEST(test_checksum_write_read)
|
||||
+START_TEST(test_dnf_solvfile_userdata)
|
||||
{
|
||||
char *new_file = solv_dupjoin(test_globals.tmpdir,
|
||||
- "/test_checksum_write_read", NULL);
|
||||
+ "/test_dnf_solvfile_userdata", NULL);
|
||||
build_test_file(new_file);
|
||||
|
||||
unsigned char cs_computed[CHKSUM_BYTES];
|
||||
- unsigned char cs_read[CHKSUM_BYTES];
|
||||
- FILE *fp = fopen(new_file, "r");
|
||||
+ FILE *fp = fopen(new_file, "r+");
|
||||
checksum_fp(cs_computed, fp);
|
||||
- // fails, file opened read-only:
|
||||
- fail_unless(checksum_write(cs_computed, fp) == 1);
|
||||
- fclose(fp);
|
||||
- fp = fopen(new_file, "r+");
|
||||
- fail_if(checksum_write(cs_computed, fp));
|
||||
+
|
||||
+ SolvUserdata solv_userdata;
|
||||
+ fail_if(solv_userdata_fill(&solv_userdata, cs_computed, NULL));
|
||||
+
|
||||
+ Pool *pool = pool_create();
|
||||
+ Repo *repo = repo_create(pool, "test_repo");
|
||||
+ Repowriter *writer = repowriter_create(repo);
|
||||
+ repowriter_set_userdata(writer, &solv_userdata, solv_userdata_size);
|
||||
+ fail_if(repowriter_write(writer, fp));
|
||||
+ repowriter_free(writer);
|
||||
fclose(fp);
|
||||
+
|
||||
fp = fopen(new_file, "r");
|
||||
- fail_if(checksum_read(cs_read, fp));
|
||||
- fail_if(checksum_cmp(cs_computed, cs_read));
|
||||
+ std::unique_ptr<SolvUserdata> dnf_solvfile = solv_userdata_read(fp);
|
||||
+ fail_unless(dnf_solvfile);
|
||||
+ fail_unless(solv_userdata_verify(dnf_solvfile.get(), cs_computed));
|
||||
fclose(fp);
|
||||
|
||||
g_free(new_file);
|
||||
+ repo_free(repo, 0);
|
||||
+ pool_free(pool);
|
||||
}
|
||||
END_TEST
|
||||
|
||||
@@ -181,7 +191,7 @@ iutil_suite(void)
|
||||
TCase *tc = tcase_create("Main");
|
||||
tcase_add_test(tc, test_abspath);
|
||||
tcase_add_test(tc, test_checksum);
|
||||
- tcase_add_test(tc, test_checksum_write_read);
|
||||
+ tcase_add_test(tc, test_dnf_solvfile_userdata);
|
||||
tcase_add_test(tc, test_mkcachedir);
|
||||
tcase_add_test(tc, test_version_split);
|
||||
suite_add_tcase(s, tc);
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,38 +0,0 @@
|
||||
From 893eb087e56588d62e81e91e5d283003bd80552a Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Tue, 8 Mar 2022 11:43:38 +0100
|
||||
Subject: [PATCH 31/34] Increase required libsolv version for cache versioning
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
libdnf.spec | 4 ++--
|
||||
2 files changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 60cf1b8c..d895b2bf 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -51,7 +51,7 @@ endif()
|
||||
|
||||
# build dependencies
|
||||
find_package(Gpgme REQUIRED)
|
||||
-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext)
|
||||
+find_package(LibSolv 0.7.20 REQUIRED COMPONENTS ext)
|
||||
find_package(OpenSSL REQUIRED)
|
||||
|
||||
|
||||
diff --git a/libdnf.spec b/libdnf.spec
|
||||
index a849cdea..aa51dd28 100644
|
||||
--- a/libdnf.spec
|
||||
+++ b/libdnf.spec
|
||||
@@ -1,5 +1,5 @@
|
||||
-%global libsolv_version 0.7.17
|
||||
-%global libmodulemd_version 2.11.2-2
|
||||
+%global libsolv_version 0.7.21
|
||||
+%global libmodulemd_version 2.13.0
|
||||
%global librepo_version 1.13.1
|
||||
%global dnf_conflict 4.3.0
|
||||
%global swig_version 3.0.12
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,46 +0,0 @@
|
||||
From b636af779fcdab326eef7bbb74912254c2fa2b0c Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Thu, 17 Mar 2022 10:34:24 +0100
|
||||
Subject: [PATCH 32/34] Add more specific error handling for loading repomd and
|
||||
primary
|
||||
|
||||
---
|
||||
libdnf/dnf-sack.cpp | 19 +++++++++++++++----
|
||||
1 file changed, 15 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-sack.cpp b/libdnf/dnf-sack.cpp
|
||||
index 61f4807c..8e11b8f8 100644
|
||||
--- a/libdnf/dnf-sack.cpp
|
||||
+++ b/libdnf/dnf-sack.cpp
|
||||
@@ -780,13 +780,24 @@ load_yum_repo(DnfSack *sack, HyRepo hrepo, GError **error)
|
||||
fp_primary = solv_xfopen(primary.c_str(), "r");
|
||||
assert(fp_primary);
|
||||
|
||||
- g_debug("fetching %s", name);
|
||||
- if (repo_add_repomdxml(repo, fp_repomd, 0) || \
|
||||
- repo_add_rpmmd(repo, fp_primary, 0, 0)) {
|
||||
+ g_debug("Loading repomd: %s", fn_repomd);
|
||||
+ if (repo_add_repomdxml(repo, fp_repomd, 0)) {
|
||||
g_set_error (error,
|
||||
DNF_ERROR,
|
||||
DNF_ERROR_INTERNAL_ERROR,
|
||||
- _("repo_add_repomdxml/rpmmd() has failed."));
|
||||
+ _("Loading repomd has failed: %s"),
|
||||
+ pool_errstr(repo->pool));
|
||||
+ retval = FALSE;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ g_debug("Loading primary: %s", primary.c_str());
|
||||
+ if (repo_add_rpmmd(repo, fp_primary, 0, 0)) {
|
||||
+ g_set_error (error,
|
||||
+ DNF_ERROR,
|
||||
+ DNF_ERROR_INTERNAL_ERROR,
|
||||
+ _("Loading primary has failed: %s"),
|
||||
+ pool_errstr(repo->pool));
|
||||
retval = FALSE;
|
||||
goto out;
|
||||
}
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From c5919efe898294420ec8e91e4eed5b9081e681c5 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= <lhrazky@redhat.com>
|
||||
Date: Thu, 17 Feb 2022 18:18:16 +0100
|
||||
Subject: [PATCH 33/34] libdnf/transaction/RPMItem: Fix handling transaction id
|
||||
in resolveTransactionItemReason
|
||||
|
||||
The maxTransactionId argument was ignored, the method was always returning the
|
||||
reason from the last transaction. This is the correct result for
|
||||
maxTransactionId = -1. In a couple of places the method is called with
|
||||
maxTransactionId = -2. Fixing this would mean nontrivial changes to the
|
||||
logic which could potentially break something else, so I'm leaving this
|
||||
behavior unchanged.
|
||||
|
||||
For non-negative values of maxTransactionId (with which it's not being called
|
||||
anywhere in dnf codebase), the commit adds a condition to SELECT only
|
||||
transaction ids less than or equal to maxTransactionId.
|
||||
|
||||
= changelog =
|
||||
msg: Fix handling transaction id in resolveTransactionItemReason
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2053014
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2010259
|
||||
---
|
||||
libdnf/transaction/RPMItem.cpp | 21 ++++++++++++++++++---
|
||||
1 file changed, 18 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/libdnf/transaction/RPMItem.cpp b/libdnf/transaction/RPMItem.cpp
|
||||
index 5f667ab9..ecce789d 100644
|
||||
--- a/libdnf/transaction/RPMItem.cpp
|
||||
+++ b/libdnf/transaction/RPMItem.cpp
|
||||
@@ -255,7 +255,11 @@ RPMItem::resolveTransactionItemReason(SQLite3Ptr conn,
|
||||
const std::string &arch,
|
||||
int64_t maxTransactionId)
|
||||
{
|
||||
- const char *sql = R"**(
|
||||
+ // NOTE: All negative maxTransactionId values are treated the same. The
|
||||
+ // method is called with maxTransactionId = -2 in a couple of places, the
|
||||
+ // semantics here have been the same as with -1 for a long time. If it
|
||||
+ // ain't broke...
|
||||
+ std::string sql = R"**(
|
||||
SELECT
|
||||
ti.action as action,
|
||||
ti.reason as reason
|
||||
@@ -271,14 +275,25 @@ RPMItem::resolveTransactionItemReason(SQLite3Ptr conn,
|
||||
AND ti.action not in (3, 5, 7, 10)
|
||||
AND i.name = ?
|
||||
AND i.arch = ?
|
||||
+ )**";
|
||||
+
|
||||
+ if (maxTransactionId >= 0) {
|
||||
+ sql.append(" AND ti.trans_id <= ?");
|
||||
+ }
|
||||
+
|
||||
+ sql.append(R"**(
|
||||
ORDER BY
|
||||
ti.trans_id DESC
|
||||
LIMIT 1
|
||||
- )**";
|
||||
+ )**");
|
||||
|
||||
if (arch != "") {
|
||||
SQLite3::Query query(*conn, sql);
|
||||
- query.bindv(name, arch);
|
||||
+ if (maxTransactionId >= 0) {
|
||||
+ query.bindv(name, arch, maxTransactionId);
|
||||
+ } else {
|
||||
+ query.bindv(name, arch);
|
||||
+ }
|
||||
|
||||
if (query.step() == SQLite3::Statement::StepResult::ROW) {
|
||||
auto action = static_cast< TransactionItemAction >(query.get< int64_t >("action"));
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
From c303b7c3723f3e9fbc43963a62237ea17516fc6b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= <lhrazky@redhat.com>
|
||||
Date: Thu, 17 Feb 2022 18:30:14 +0100
|
||||
Subject: [PATCH 34/34] libdnf/transaction/TransactionItem: Set short action
|
||||
for Reason Change
|
||||
|
||||
Sets the "short" (one letter) representation of the Reason Change action
|
||||
to "C".
|
||||
|
||||
This was likely not ever used before as the only way to create a
|
||||
transaction with a reason change and something else is rolling back
|
||||
multiple transactions, which was broken.
|
||||
---
|
||||
libdnf/transaction/TransactionItem.cpp | 3 +--
|
||||
1 file changed, 1 insertion(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libdnf/transaction/TransactionItem.cpp b/libdnf/transaction/TransactionItem.cpp
|
||||
index 3b43d1f1..4358038e 100644
|
||||
--- a/libdnf/transaction/TransactionItem.cpp
|
||||
+++ b/libdnf/transaction/TransactionItem.cpp
|
||||
@@ -51,8 +51,7 @@ static const std::map< TransactionItemAction, std::string > transactionItemActio
|
||||
{TransactionItemAction::REMOVE, "E"},
|
||||
{TransactionItemAction::REINSTALL, "R"},
|
||||
{TransactionItemAction::REINSTALLED, "R"},
|
||||
- // TODO: replace "?" with something better
|
||||
- {TransactionItemAction::REASON_CHANGE, "?"},
|
||||
+ {TransactionItemAction::REASON_CHANGE, "C"},
|
||||
};
|
||||
|
||||
/*
|
||||
--
|
||||
2.31.1
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From c4ee580c73375060b6eb5b3414636688e3d601c3 Mon Sep 17 00:00:00 2001
|
||||
From: Marek Blaha <mblaha@redhat.com>
|
||||
Date: Fri, 10 Jun 2022 15:29:56 +0200
|
||||
Subject: [PATCH] Do not print errors on failovermethod repo option
|
||||
(RhBug:2039906)
|
||||
|
||||
= changelog =
|
||||
msg: Do not print errors if repository config contains failovermethod option
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2039906
|
||||
---
|
||||
libdnf/conf/ConfigRepo.cpp | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
|
||||
diff --git a/libdnf/conf/ConfigRepo.cpp b/libdnf/conf/ConfigRepo.cpp
|
||||
index e98ac0af..0cb52f58 100644
|
||||
--- a/libdnf/conf/ConfigRepo.cpp
|
||||
+++ b/libdnf/conf/ConfigRepo.cpp
|
||||
@@ -22,6 +22,8 @@
|
||||
#include "Const.hpp"
|
||||
#include "Config-private.hpp"
|
||||
|
||||
+#include "bgettext/bgettext-lib.h"
|
||||
+
|
||||
namespace libdnf {
|
||||
|
||||
class ConfigRepo::Impl {
|
||||
@@ -174,6 +176,14 @@ ConfigRepo::Impl::Impl(Config & owner, ConfigMain & mainConfig)
|
||||
owner.optBinds().add("enabled_metadata", enabled_metadata);
|
||||
owner.optBinds().add("user_agent", user_agent);
|
||||
owner.optBinds().add("countme", countme);
|
||||
+ owner.optBinds().add("failovermethod", failovermethod,
|
||||
+ [&](Option::Priority priority, const std::string & value){
|
||||
+ if (value != "priority") {
|
||||
+ throw Option::InvalidValue(_("only the value 'priority' is supported."));
|
||||
+ }
|
||||
+ failovermethod.set(priority, value);
|
||||
+ }, nullptr, false
|
||||
+ );
|
||||
owner.optBinds().add("sslverifystatus", sslverifystatus);
|
||||
}
|
||||
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,24 +0,0 @@
|
||||
From 9dbd5f8f0ac3d6d3fab9147a3208623cba698682 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Luk=C3=A1=C5=A1=20Hr=C3=A1zk=C3=BD?= <lhrazky@redhat.com>
|
||||
Date: Tue, 14 Jun 2022 17:26:44 +0200
|
||||
Subject: [PATCH] sack/query.hpp: Add a missing include
|
||||
|
||||
---
|
||||
libdnf/sack/query.hpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/libdnf/sack/query.hpp b/libdnf/sack/query.hpp
|
||||
index 9e49761c..306b24e3 100644
|
||||
--- a/libdnf/sack/query.hpp
|
||||
+++ b/libdnf/sack/query.hpp
|
||||
@@ -26,6 +26,7 @@
|
||||
#include "../hy-types.h"
|
||||
#include "../hy-query.h"
|
||||
#include "../hy-subject.h"
|
||||
+#include "../nevra.hpp"
|
||||
#include "../repo/solvable/Dependency.hpp"
|
||||
#include "../repo/solvable/DependencyContainer.hpp"
|
||||
#include "../transaction/Swdb.hpp"
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,128 +0,0 @@
|
||||
From 876393d5d0cd5f806415dcdc90168e58e66da916 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Mon, 28 Mar 2022 07:29:48 +0200
|
||||
Subject: [PATCH] context: dnf_context_remove accepts `<package-spec>` as dnf,
|
||||
unify code
|
||||
|
||||
Prior to change, the `dnf_context_remove` function only accepted
|
||||
the package name (without globs). It was not possible to enter more detailed
|
||||
specifications and thus, for example, select a specific version of the package
|
||||
to uninstall - for example, which kernel we want to uninstall.
|
||||
This patch adds full `<package-spec>` support as in dnf, including support
|
||||
for globs (wildcards) and searching against 'provides' and 'file provides'.
|
||||
|
||||
Better error handling for `hy_goal_upgrade_selector` in` dnf_context_update`.
|
||||
|
||||
Unification of the function code `dnf_context_install`, `dnf_context_remove`,
|
||||
`dnf_context_update`.
|
||||
|
||||
= changelog =
|
||||
msg: context: Support <package-spec> (NEVRA forms, provides, file provides) including globs in the dnf_context_remove func
|
||||
type: enhancement
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2084602
|
||||
---
|
||||
libdnf/dnf-context.cpp | 46 ++++++++++++++++++++++++------------------
|
||||
1 file changed, 26 insertions(+), 20 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
||||
index 6cb0011b..4b055f03 100644
|
||||
--- a/libdnf/dnf-context.cpp
|
||||
+++ b/libdnf/dnf-context.cpp
|
||||
@@ -2391,10 +2391,9 @@ dnf_context_run(DnfContext *context, GCancellable *cancellable, GError **error)
|
||||
* Since: 0.1.0
|
||||
**/
|
||||
gboolean
|
||||
-dnf_context_install (DnfContext *context, const gchar *name, GError **error) try
|
||||
+dnf_context_install(DnfContext *context, const gchar *name, GError **error) try
|
||||
{
|
||||
DnfContextPrivate *priv = GET_PRIVATE (context);
|
||||
- g_autoptr(GPtrArray) selector_matches = NULL;
|
||||
|
||||
/* create sack and add sources */
|
||||
if (priv->sack == NULL) {
|
||||
@@ -2405,7 +2404,7 @@ dnf_context_install (DnfContext *context, const gchar *name, GError **error) try
|
||||
|
||||
g_auto(HySubject) subject = hy_subject_create(name);
|
||||
g_auto(HySelector) selector = hy_subject_get_best_selector(subject, priv->sack, NULL, FALSE, NULL);
|
||||
- selector_matches = hy_selector_matches(selector);
|
||||
+ g_autoptr(GPtrArray) selector_matches = hy_selector_matches(selector);
|
||||
if (selector_matches->len == 0) {
|
||||
g_set_error(error,
|
||||
DNF_ERROR,
|
||||
@@ -2438,31 +2437,33 @@ gboolean
|
||||
dnf_context_remove(DnfContext *context, const gchar *name, GError **error) try
|
||||
{
|
||||
DnfContextPrivate *priv = GET_PRIVATE(context);
|
||||
- GPtrArray *pkglist;
|
||||
- hy_autoquery HyQuery query = NULL;
|
||||
- gboolean ret = TRUE;
|
||||
- guint i;
|
||||
|
||||
/* create sack and add repos */
|
||||
if (priv->sack == NULL) {
|
||||
dnf_state_reset(priv->state);
|
||||
- ret = dnf_context_setup_sack(context, priv->state, error);
|
||||
- if (!ret)
|
||||
+ if (!dnf_context_setup_sack(context, priv->state, error))
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- /* find installed packages to remove */
|
||||
- query = hy_query_create(priv->sack);
|
||||
- query->installed();
|
||||
- hy_query_filter(query, HY_PKG_NAME, HY_EQ, name);
|
||||
- pkglist = hy_query_run(query);
|
||||
+ libdnf::Query query(priv->sack, libdnf::Query::ExcludeFlags::APPLY_EXCLUDES);
|
||||
+ query.installed();
|
||||
+ auto ret = query.filterSubject(name, nullptr, false, true, true, true);
|
||||
+ if (!ret.first) {
|
||||
+ g_set_error(error,
|
||||
+ DNF_ERROR,
|
||||
+ DNF_ERROR_PACKAGE_NOT_FOUND,
|
||||
+ "No installed package matches '%s'", name);
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ g_autoptr(GPtrArray) packages = query.run();
|
||||
|
||||
/* add each package */
|
||||
- for (i = 0; i < pkglist->len; i++) {
|
||||
- auto pkg = static_cast<DnfPackage *>(g_ptr_array_index(pkglist, i));
|
||||
+ for (guint i = 0; i < packages->len; i++) {
|
||||
+ auto pkg = static_cast<DnfPackage *>(g_ptr_array_index(packages, i));
|
||||
hy_goal_erase(priv->goal, pkg);
|
||||
}
|
||||
- g_ptr_array_unref(pkglist);
|
||||
+
|
||||
return TRUE;
|
||||
} CATCH_TO_GERROR(FALSE)
|
||||
|
||||
@@ -2493,8 +2494,7 @@ dnf_context_update(DnfContext *context, const gchar *name, GError **error) try
|
||||
}
|
||||
|
||||
g_auto(HySubject) subject = hy_subject_create(name);
|
||||
- g_auto(HySelector) selector = hy_subject_get_best_selector(subject, priv->sack, NULL, FALSE,
|
||||
- NULL);
|
||||
+ g_auto(HySelector) selector = hy_subject_get_best_selector(subject, priv->sack, NULL, FALSE, NULL);
|
||||
g_autoptr(GPtrArray) selector_matches = hy_selector_matches(selector);
|
||||
if (selector_matches->len == 0) {
|
||||
g_set_error(error,
|
||||
@@ -2504,8 +2504,14 @@ dnf_context_update(DnfContext *context, const gchar *name, GError **error) try
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
- if (hy_goal_upgrade_selector(priv->goal, selector))
|
||||
+ int ret = hy_goal_upgrade_selector(priv->goal, selector);
|
||||
+ if (ret != 0) {
|
||||
+ g_set_error(error,
|
||||
+ DNF_ERROR,
|
||||
+ ret,
|
||||
+ "Ill-formed Selector '%s'", name);
|
||||
return FALSE;
|
||||
+ }
|
||||
|
||||
return TRUE;
|
||||
} CATCH_TO_GERROR(FALSE)
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From 44d75a36d7c8a933119e5b63f180a8c23715ec51 Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Mon, 28 Mar 2022 07:51:45 +0200
|
||||
Subject: [PATCH] context: Fix doc dnf_context_install/remove/update/distrosync
|
||||
|
||||
Functions do not support groups - only packages are supported.
|
||||
|
||||
The `dnf_context_remove` function marks all matching packages for removal
|
||||
- not just the oldest one.
|
||||
---
|
||||
libdnf/dnf-context.cpp | 10 +++++-----
|
||||
1 file changed, 5 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/libdnf/dnf-context.cpp b/libdnf/dnf-context.cpp
|
||||
index 4b055f03..fe005430 100644
|
||||
--- a/libdnf/dnf-context.cpp
|
||||
+++ b/libdnf/dnf-context.cpp
|
||||
@@ -2379,7 +2379,7 @@ dnf_context_run(DnfContext *context, GCancellable *cancellable, GError **error)
|
||||
/**
|
||||
* dnf_context_install:
|
||||
* @context: a #DnfContext instance.
|
||||
- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop"
|
||||
+ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox"
|
||||
* @error: A #GError or %NULL
|
||||
*
|
||||
* Finds a remote package and marks it to be installed.
|
||||
@@ -2422,12 +2422,12 @@ dnf_context_install(DnfContext *context, const gchar *name, GError **error) try
|
||||
/**
|
||||
* dnf_context_remove:
|
||||
* @context: a #DnfContext instance.
|
||||
- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop"
|
||||
+ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox"
|
||||
* @error: A #GError or %NULL
|
||||
*
|
||||
* Finds an installed package and marks it to be removed.
|
||||
*
|
||||
- * If multiple packages are available then only the oldest package is removed.
|
||||
+ * If multiple packages are available, all of them will be removed.
|
||||
*
|
||||
* Returns: %TRUE for success, %FALSE otherwise
|
||||
*
|
||||
@@ -2470,7 +2470,7 @@ dnf_context_remove(DnfContext *context, const gchar *name, GError **error) try
|
||||
/**
|
||||
* dnf_context_update:
|
||||
* @context: a #DnfContext instance.
|
||||
- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop"
|
||||
+ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox"
|
||||
* @error: A #GError or %NULL
|
||||
*
|
||||
* Finds an installed and remote package and marks it to be updated.
|
||||
@@ -2548,7 +2548,7 @@ dnf_context_update_all (DnfContext *context,
|
||||
/**
|
||||
* dnf_context_distrosync:
|
||||
* @context: a #DnfContext instance.
|
||||
- * @name: A package or group name, e.g. "firefox" or "@gnome-desktop"
|
||||
+ * @name: A package specification (NEVRA forms, provide, file provide, globs supported) e.g. "firefox"
|
||||
* @error: A #GError or %NULL
|
||||
*
|
||||
* Finds an installed and remote package and marks it to be synchronized with remote version.
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,100 +0,0 @@
|
||||
From cf4893a0128c567ed1fdd1b02c9cf2b43bfb02f7 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Mon, 30 May 2022 08:59:41 +0200
|
||||
Subject: [PATCH] advisory upgrade: filter out advPkgs with different arch
|
||||
|
||||
This prevents a situation in security upgrades where libsolv cannot
|
||||
upgrade dependent pkgs because we ask for an upgrade of different arch:
|
||||
|
||||
We can get the following testcase if libdnf has filtered out
|
||||
json-c-2-2.el8.x86_64@rhel-8-for-x86_64-baseos-rpms
|
||||
(because there is an advisory for already installed json-c-1-1.el8.x86_64) but
|
||||
json-c-2-2.el8.i686@rhel-8-for-x86_64-baseos-rpms is not filtered out because
|
||||
it has different architecture. The resulting transaction doesn't work.
|
||||
|
||||
```
|
||||
repo @System -99.-1000 testtags <inline>
|
||||
#>=Pkg: bind-libs-lite 1 1.el8 x86_64
|
||||
#>=Pkg: json-c 1 1.el8 x86_64
|
||||
|
||||
repo rhel-8-for-x86_64-baseos-rpms -99.-1000 testtags <inline>
|
||||
#>=Pkg: json-c 2 2.el8 x86_64
|
||||
#>=Prv: libjson-c.so.4()(64bit)
|
||||
#>
|
||||
#>=Pkg: json-c 2 2.el8 i686
|
||||
#>=Prv: libjson-c.so.4()
|
||||
#>
|
||||
#>=Pkg: bind-libs-lite 2 2.el8 x86_64
|
||||
#>=Req: libjson-c.so.4()(64bit)
|
||||
system x86_64 rpm @System
|
||||
job update oneof json-c-1-1.el8.x86_64@@System json-c-2-2.el8.i686@rhel-8-for-x86_64-baseos-rpms bind-libs-lite-2-2.el8.x86_64@rhel-8-for-x86_64-baseos-rpms [forcebest,targeted,setevr,setarch]
|
||||
result transaction,problems <inline>
|
||||
#>problem f06d81a4 info package bind-libs-lite-2-2.el8.x86_64 requires libjson-c.so.4()(64bit), but none of the providers can be installed
|
||||
#>problem f06d81a4 solution 96f9031b allow bind-libs-lite-1-1.el8.x86_64@@System
|
||||
#>problem f06d81a4 solution c8daf94f allow json-c-2-2.el8.x86_64@rhel-8-for-x86_64-baseos-rpms
|
||||
#>upgrade bind-libs-lite-1-1.el8.x86_64@@System bind-libs-lite-2-2.el8.x86_64@rhel-8-for-x86_64-baseos-rpms
|
||||
#>upgrade json-c-1-1.el8.x86_64@@System json-c-2-2.el8.x86_64@rhel-8-for-x86_64-baseos-rpms```
|
||||
```
|
||||
|
||||
= changelog =
|
||||
msg: Filter out advisory pkgs with different arch during advisory upgrade, fixes possible problems in dependency resulution.
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2088149
|
||||
---
|
||||
libdnf/sack/query.cpp | 25 +++++++++++++++++++------
|
||||
1 file changed, 19 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/libdnf/sack/query.cpp b/libdnf/sack/query.cpp
|
||||
index ac2736b5..03d39659 100644
|
||||
--- a/libdnf/sack/query.cpp
|
||||
+++ b/libdnf/sack/query.cpp
|
||||
@@ -1877,12 +1877,6 @@ Query::Impl::filterAdvisory(const Filter & f, Map *m, int keyname)
|
||||
std::vector<Solvable *> candidates;
|
||||
std::vector<Solvable *> installed_solvables;
|
||||
|
||||
- Id id = -1;
|
||||
- while ((id = resultPset->next(id)) != -1) {
|
||||
- candidates.push_back(pool_id2solvable(pool, id));
|
||||
- }
|
||||
- NameArchEVRComparator cmp_key(pool);
|
||||
-
|
||||
if (cmp_type & HY_UPGRADE) {
|
||||
Query installed(sack, ExcludeFlags::IGNORE_EXCLUDES);
|
||||
installed.installed();
|
||||
@@ -1893,6 +1887,18 @@ Query::Impl::filterAdvisory(const Filter & f, Map *m, int keyname)
|
||||
installed_solvables.push_back(pool_id2solvable(pool, installed_id));
|
||||
}
|
||||
std::sort(installed_solvables.begin(), installed_solvables.end(), NameArchSolvableComparator);
|
||||
+ Id id = -1;
|
||||
+ while ((id = resultPset->next(id)) != -1) {
|
||||
+ Solvable * s = pool_id2solvable(pool, id);
|
||||
+ // When doing HY_UPGRADE consider only candidate pkgs that have matching Name and Arch
|
||||
+ // with some already installed pkg (in other words: some other version of the pkg is already installed).
|
||||
+ // Otherwise a pkg with different Arch than installed can end up in upgrade set which is wrong.
|
||||
+ // It can result in dependency issues, reported as: RhBug:2088149.
|
||||
+ auto low = std::lower_bound(installed_solvables.begin(), installed_solvables.end(), s, NameArchSolvableComparator);
|
||||
+ if (low != installed_solvables.end() && s->name == (*low)->name && s->arch == (*low)->arch) {
|
||||
+ candidates.push_back(s);
|
||||
+ }
|
||||
+ }
|
||||
|
||||
// Apply security filters only to packages with lower priority - to unify behaviour upgrade
|
||||
// and upgrade-minimal
|
||||
@@ -1915,7 +1921,14 @@ Query::Impl::filterAdvisory(const Filter & f, Map *m, int keyname)
|
||||
}
|
||||
}
|
||||
std::swap(candidates, priority_candidates);
|
||||
+ } else {
|
||||
+ Id id = -1;
|
||||
+ while ((id = resultPset->next(id)) != -1) {
|
||||
+ candidates.push_back(pool_id2solvable(pool, id));
|
||||
+ }
|
||||
}
|
||||
+
|
||||
+ NameArchEVRComparator cmp_key(pool);
|
||||
std::sort(candidates.begin(), candidates.end(), cmp_key);
|
||||
for (auto & advisoryPkg : pkgs) {
|
||||
if (cmp_type & HY_UPGRADE) {
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,71 +0,0 @@
|
||||
From 652977360c4253faff9e95d35c603b2f585671fe Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
||||
Date: Tue, 5 Jul 2022 09:02:22 +0200
|
||||
Subject: [PATCH] Add obsoletes to filtering for advisory candidates
|
||||
|
||||
Patch https://github.com/rpm-software-management/libdnf/pull/1526
|
||||
introduced a regression where we no longer do a security upgrade if a
|
||||
package A is installed and package B obsoletes A and B is available in two
|
||||
versions while there is an advisory for the second version.
|
||||
|
||||
Test: https://github.com/rpm-software-management/ci-dnf-stack/pull/1130
|
||||
---
|
||||
libdnf/sack/query.cpp | 32 ++++++++++++++++++++++++++++----
|
||||
1 file changed, 28 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/libdnf/sack/query.cpp b/libdnf/sack/query.cpp
|
||||
index 03d39659..5355f9f7 100644
|
||||
--- a/libdnf/sack/query.cpp
|
||||
+++ b/libdnf/sack/query.cpp
|
||||
@@ -1878,6 +1878,13 @@ Query::Impl::filterAdvisory(const Filter & f, Map *m, int keyname)
|
||||
std::vector<Solvable *> installed_solvables;
|
||||
|
||||
if (cmp_type & HY_UPGRADE) {
|
||||
+ // When doing HY_UPGRADE consider only candidate pkgs that have matching Name and Arch with:
|
||||
+ // * some already installed pkg (in other words: some other version of the pkg is already installed)
|
||||
+ // or
|
||||
+ // * with pkg that obsoletes some already installed (or to be installed in this transaction) pkg
|
||||
+ // Otherwise a pkg with different Arch than installed can end up in upgrade set which is wrong.
|
||||
+ // It can result in dependency issues, reported as: RhBug:2088149.
|
||||
+
|
||||
Query installed(sack, ExcludeFlags::IGNORE_EXCLUDES);
|
||||
installed.installed();
|
||||
installed.addFilter(HY_PKG_LATEST_PER_ARCH, HY_EQ, 1);
|
||||
@@ -1887,13 +1894,30 @@ Query::Impl::filterAdvisory(const Filter & f, Map *m, int keyname)
|
||||
installed_solvables.push_back(pool_id2solvable(pool, installed_id));
|
||||
}
|
||||
std::sort(installed_solvables.begin(), installed_solvables.end(), NameArchSolvableComparator);
|
||||
+
|
||||
+ Query obsoletes(sack, ExcludeFlags::IGNORE_EXCLUDES);
|
||||
+ obsoletes.addFilter(HY_PKG, HY_EQ, resultPset);
|
||||
+ obsoletes.available();
|
||||
+
|
||||
+ Query possibly_obsoleted(sack, ExcludeFlags::IGNORE_EXCLUDES);
|
||||
+ possibly_obsoleted.addFilter(HY_PKG, HY_EQ, resultPset);
|
||||
+ possibly_obsoleted.addFilter(HY_PKG_UPGRADES, HY_EQ, 1);
|
||||
+ possibly_obsoleted.queryUnion(installed);
|
||||
+ possibly_obsoleted.apply();
|
||||
+
|
||||
+ obsoletes.addFilter(HY_PKG_OBSOLETES, HY_EQ, possibly_obsoleted.runSet());
|
||||
+ obsoletes.apply();
|
||||
+ Id obsoleted_id = -1;
|
||||
+ // Add to candidates resultPset pkgs that obsolete some installed (or to be installed in this transaction) pkg
|
||||
+ while ((obsoleted_id = obsoletes.pImpl->result->next(obsoleted_id)) != -1) {
|
||||
+ Solvable * s = pool_id2solvable(pool, obsoleted_id);
|
||||
+ candidates.push_back(s);
|
||||
+ }
|
||||
+
|
||||
Id id = -1;
|
||||
+ // Add to candidates resultPset pkgs that match name and arch with some already installed pkg
|
||||
while ((id = resultPset->next(id)) != -1) {
|
||||
Solvable * s = pool_id2solvable(pool, id);
|
||||
- // When doing HY_UPGRADE consider only candidate pkgs that have matching Name and Arch
|
||||
- // with some already installed pkg (in other words: some other version of the pkg is already installed).
|
||||
- // Otherwise a pkg with different Arch than installed can end up in upgrade set which is wrong.
|
||||
- // It can result in dependency issues, reported as: RhBug:2088149.
|
||||
auto low = std::lower_bound(installed_solvables.begin(), installed_solvables.end(), s, NameArchSolvableComparator);
|
||||
if (low != installed_solvables.end() && s->name == (*low)->name && s->arch == (*low)->arch) {
|
||||
candidates.push_back(s);
|
||||
--
|
||||
2.36.1
|
||||
|
||||
@ -1,35 +0,0 @@
|
||||
From 3a3929a27734aa77c980610a43039cb6b2b6d658 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Kolarik <jkolarik@redhat.com>
|
||||
Date: Wed, 10 Aug 2022 05:21:38 +0000
|
||||
Subject: [PATCH] Fix listing a repository without cpeid (RhBug:2066334)
|
||||
|
||||
= changelog =
|
||||
type: bugfix
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2066334
|
||||
---
|
||||
libdnf/repo/Repo.cpp | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/libdnf/repo/Repo.cpp b/libdnf/repo/Repo.cpp
|
||||
index e3a574fb..d61a24a5 100644
|
||||
--- a/libdnf/repo/Repo.cpp
|
||||
+++ b/libdnf/repo/Repo.cpp
|
||||
@@ -1021,8 +1021,13 @@ bool Repo::Impl::loadCache(bool throwExcept, bool ignoreMissing)
|
||||
for (auto elem = yum_repomd->distro_tags; elem; elem = g_slist_next(elem)) {
|
||||
if (elem->data) {
|
||||
auto distroTag = static_cast<LrYumDistroTag *>(elem->data);
|
||||
- if (distroTag->tag)
|
||||
- distro_tags.emplace_back(distroTag->cpeid, distroTag->tag);
|
||||
+ if (distroTag->tag) {
|
||||
+ std::string cpeid_str;
|
||||
+ if (distroTag->cpeid) {
|
||||
+ cpeid_str = distroTag->cpeid;
|
||||
+ }
|
||||
+ distro_tags.emplace_back(std::move(cpeid_str), distroTag->tag);
|
||||
+ }
|
||||
}
|
||||
}
|
||||
|
||||
--
|
||||
2.37.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,47 +0,0 @@
|
||||
From a5fe0e0eb6457ca51fabe8123d7407951cb8fcba Mon Sep 17 00:00:00 2001
|
||||
From: Jaroslav Rohel <jrohel@redhat.com>
|
||||
Date: Wed, 24 May 2023 12:35:29 +0200
|
||||
Subject: [PATCH] conf: Support "proxy=_none_" in main config (RhBug:2155713)
|
||||
|
||||
It has the same meaning as "proxy=". Introduced for compatibility with yum.
|
||||
Yum does not support a proxy option with an empty value. Instead, it has
|
||||
the special value "_none_". The value "_none_" is case insensitive.
|
||||
|
||||
Support for "proxy=_none_" in the repository configuration was added some
|
||||
time ago - in commit ea749e6238cdb54fe3b5add67875ab5912d2e766
|
||||
|
||||
= changelog =
|
||||
msg: Support "proxy=_none_" in main config
|
||||
type: enhancement
|
||||
resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2155713
|
||||
---
|
||||
libdnf/conf/ConfigMain.cpp | 13 ++++++++++++-
|
||||
1 file changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/libdnf/conf/ConfigMain.cpp b/libdnf/conf/ConfigMain.cpp
|
||||
index a6645d70..a775cf8c 100644
|
||||
--- a/libdnf/conf/ConfigMain.cpp
|
||||
+++ b/libdnf/conf/ConfigMain.cpp
|
||||
@@ -476,7 +476,18 @@ ConfigMain::Impl::Impl(Config & owner)
|
||||
}, nullptr, true
|
||||
);
|
||||
|
||||
- owner.optBinds().add("proxy", proxy);
|
||||
+ owner.optBinds().add("proxy", proxy,
|
||||
+ [&](Option::Priority priority, const std::string & value){
|
||||
+ auto tmpValue(value);
|
||||
+ for (auto & ch : tmpValue)
|
||||
+ ch = std::tolower(ch);
|
||||
+ if (tmpValue == "_none_")
|
||||
+ proxy.set(priority, "");
|
||||
+ else
|
||||
+ proxy.set(priority, value);
|
||||
+ }, nullptr, false
|
||||
+ );
|
||||
+
|
||||
owner.optBinds().add("proxy_username", proxy_username);
|
||||
owner.optBinds().add("proxy_password", proxy_password);
|
||||
owner.optBinds().add("proxy_auth_method", proxy_auth_method);
|
||||
--
|
||||
2.40.1
|
||||
|
||||
Loading…
Reference in new issue