Blame SOURCES/0015-Apply-targeted-upgrade-only-for-selector-with-packages.patch
|
Pablo Greco |
df9f9f |
From c235dae84d1b45911f6de1c5d31fedf4856c0d42 Mon Sep 17 00:00:00 2001
|
|
Pablo Greco |
df9f9f |
From: Jaroslav Mracek <jmracek@redhat.com>
|
|
Pablo Greco |
df9f9f |
Date: Wed, 11 Sep 2019 13:26:43 +0200
|
|
Pablo Greco |
df9f9f |
Subject: [PATCH] Apply targeted upgrade only for selector with packages
|
|
Pablo Greco |
df9f9f |
|
|
Pablo Greco |
df9f9f |
It resolves problem when selector with name filter is used. Then
|
|
Pablo Greco |
df9f9f |
targeted transaction ignores obsoletes.
|
|
Pablo Greco |
df9f9f |
|
|
Pablo Greco |
df9f9f |
Closes: #793
|
|
Pablo Greco |
df9f9f |
Approved by: jrohel
|
|
Pablo Greco |
df9f9f |
---
|
|
Pablo Greco |
df9f9f |
libdnf/goal/Goal.cpp | 6 +++++-
|
|
Pablo Greco |
df9f9f |
1 file changed, 5 insertions(+), 1 deletion(-)
|
|
Pablo Greco |
df9f9f |
|
|
Pablo Greco |
df9f9f |
diff --git a/libdnf/goal/Goal.cpp b/libdnf/goal/Goal.cpp
|
|
Pablo Greco |
df9f9f |
index a38cbb4..88e7b8c 100644
|
|
Pablo Greco |
df9f9f |
--- a/libdnf/goal/Goal.cpp
|
|
Pablo Greco |
df9f9f |
+++ b/libdnf/goal/Goal.cpp
|
|
Pablo Greco |
df9f9f |
@@ -767,7 +767,11 @@ void
|
|
Pablo Greco |
df9f9f |
Goal::upgrade(HySelector sltr)
|
|
Pablo Greco |
df9f9f |
{
|
|
Pablo Greco |
df9f9f |
pImpl->actions = static_cast<DnfGoalActions>(pImpl->actions | DNF_UPGRADE);
|
|
Pablo Greco |
df9f9f |
- sltrToJob(sltr, &pImpl->staging, SOLVER_UPDATE|SOLVER_TARGETED);
|
|
Pablo Greco |
df9f9f |
+ auto flags = SOLVER_UPDATE;
|
|
Pablo Greco |
df9f9f |
+ if (sltr->getPkgs()) {
|
|
Pablo Greco |
df9f9f |
+ flags |= SOLVER_TARGETED;
|
|
Pablo Greco |
df9f9f |
+ }
|
|
Pablo Greco |
df9f9f |
+ sltrToJob(sltr, &pImpl->staging, flags);
|
|
Pablo Greco |
df9f9f |
}
|
|
Pablo Greco |
df9f9f |
|
|
Pablo Greco |
df9f9f |
void
|
|
Pablo Greco |
df9f9f |
--
|
|
Pablo Greco |
df9f9f |
libgit2 0.28.2
|
|
Pablo Greco |
df9f9f |
|