|
 |
379fd8 |
From e43ef244e78d8563eb3cb7ff6a6074946f60c877 Mon Sep 17 00:00:00 2001
|
|
|
379fd8 |
From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= <amatej@redhat.com>
|
|
|
379fd8 |
Date: Sun, 25 Apr 2021 19:47:53 +0200
|
|
|
379fd8 |
Subject: [PATCH 09/19] Revert "Change mechanism of module conflicts"
|
|
|
379fd8 |
|
|
|
379fd8 |
This reverts commit 49600ba05b474bc29651aa122a9116b5ada69f4d.
|
|
|
379fd8 |
---
|
|
|
379fd8 |
libdnf/dnf-sack.cpp | 1 +
|
|
|
379fd8 |
libdnf/module/ModulePackage.cpp | 2 --
|
|
|
379fd8 |
libdnf/module/ModulePackage.hpp | 1 -
|
|
|
379fd8 |
libdnf/module/ModulePackageContainer.cpp | 1 -
|
|
|
379fd8 |
libdnf/module/ModulePackageContainer.hpp | 1 -
|
|
|
379fd8 |
5 files changed, 1 insertion(+), 5 deletions(-)
|
|
|
379fd8 |
|
|
|
379fd8 |
diff --git a/libdnf/dnf-sack.cpp b/libdnf/dnf-sack.cpp
|
|
|
379fd8 |
index b5c7edc0..b9baeaef 100644
|
|
|
379fd8 |
--- a/libdnf/dnf-sack.cpp
|
|
|
379fd8 |
+++ b/libdnf/dnf-sack.cpp
|
|
|
379fd8 |
@@ -2297,6 +2297,7 @@ void readModuleMetadataFromRepo(DnfSack * sack, libdnf::ModulePackageContainer *
|
|
|
379fd8 |
modulePackages->add(sack);
|
|
|
379fd8 |
modulePackages->loadFailSafeData();
|
|
|
379fd8 |
if (!modulePackages->empty()) {
|
|
|
379fd8 |
+ modulePackages->createConflictsBetweenStreams();
|
|
|
379fd8 |
// TODO remove hard-coded path
|
|
|
379fd8 |
try {
|
|
|
379fd8 |
std::vector<std::string> paths{"/etc/os-release", "/usr/lib/os-release"};
|
|
|
379fd8 |
diff --git a/libdnf/module/ModulePackage.cpp b/libdnf/module/ModulePackage.cpp
|
|
|
379fd8 |
index d0017877..d644eca6 100644
|
|
|
379fd8 |
--- a/libdnf/module/ModulePackage.cpp
|
|
|
379fd8 |
+++ b/libdnf/module/ModulePackage.cpp
|
|
|
379fd8 |
@@ -75,8 +75,6 @@ static void setSovable(Pool * pool, Solvable * solvable, const std::string & nam
|
|
|
379fd8 |
ss << "module(" << name << ")";
|
|
|
379fd8 |
auto depId = pool_str2id(pool, ss.str().c_str(), 1);
|
|
|
379fd8 |
solvable_add_deparray(solvable, SOLVABLE_PROVIDES, depId, -1);
|
|
|
379fd8 |
- // create Conflicts: module($name)
|
|
|
379fd8 |
- solvable_add_deparray(solvable, SOLVABLE_CONFLICTS, depId, 0);
|
|
|
379fd8 |
|
|
|
379fd8 |
// create Provide: module($name:$stream)
|
|
|
379fd8 |
ss.str(std::string());
|
|
|
379fd8 |
diff --git a/libdnf/module/ModulePackage.hpp b/libdnf/module/ModulePackage.hpp
|
|
|
379fd8 |
index b618df58..145c6d63 100644
|
|
|
379fd8 |
--- a/libdnf/module/ModulePackage.hpp
|
|
|
379fd8 |
+++ b/libdnf/module/ModulePackage.hpp
|
|
|
379fd8 |
@@ -71,7 +71,6 @@ public:
|
|
|
379fd8 |
|
|
|
379fd8 |
std::vector<ModuleDependencies> getModuleDependencies() const;
|
|
|
379fd8 |
|
|
|
379fd8 |
- ///DEPRECATED
|
|
|
379fd8 |
void addStreamConflict(const ModulePackage * package);
|
|
|
379fd8 |
|
|
|
379fd8 |
Id getId() const { return id; };
|
|
|
379fd8 |
diff --git a/libdnf/module/ModulePackageContainer.cpp b/libdnf/module/ModulePackageContainer.cpp
|
|
|
379fd8 |
index 97c84c01..893b839a 100644
|
|
|
379fd8 |
--- a/libdnf/module/ModulePackageContainer.cpp
|
|
|
379fd8 |
+++ b/libdnf/module/ModulePackageContainer.cpp
|
|
|
379fd8 |
@@ -204,7 +204,6 @@ private:
|
|
|
379fd8 |
/// solvable.arch = <moduleArch>
|
|
|
379fd8 |
/// solvable.summary = <moduleContext>
|
|
|
379fd8 |
/// solvable.description = <moduleName>:<moduleStream>
|
|
|
379fd8 |
- /// solvable.conflicts = module(<moduleName>)
|
|
|
379fd8 |
DnfSack * moduleSack;
|
|
|
379fd8 |
std::unique_ptr<PackageSet> activatedModules;
|
|
|
379fd8 |
std::string installRoot;
|
|
|
379fd8 |
diff --git a/libdnf/module/ModulePackageContainer.hpp b/libdnf/module/ModulePackageContainer.hpp
|
|
|
379fd8 |
index 99fc0677..c1001fce 100644
|
|
|
379fd8 |
--- a/libdnf/module/ModulePackageContainer.hpp
|
|
|
379fd8 |
+++ b/libdnf/module/ModulePackageContainer.hpp
|
|
|
379fd8 |
@@ -115,7 +115,6 @@ public:
|
|
|
379fd8 |
Id addPlatformPackage(const std::string &osReleasePath, const char * platformModule);
|
|
|
379fd8 |
Id addPlatformPackage(DnfSack * sack,
|
|
|
379fd8 |
const std::vector<std::string> & osReleasePath, const char * platformModule);
|
|
|
379fd8 |
- /// DEPRECATED
|
|
|
379fd8 |
void createConflictsBetweenStreams();
|
|
|
379fd8 |
|
|
|
379fd8 |
/**
|
|
|
379fd8 |
--
|
|
|
379fd8 |
2.31.1
|
|
|
379fd8 |
|