rpms/libdnf
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport fixes for RHBZ#1642796 from upstream master

Browse Source
This commit is contained in:
Jaroslav Mracek 2018-11-07 12:32:54 +01:00
parent 283775c26f
commit 110180004d
2 changed files with 31 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
0006-transaction-Fix-transaction-item-lookup-for-obsoleted-packages-RhBug-1642796.patch Normal file
View File

@ -0,0 +1,26 @@
From b2d35e9b7168c572320444e5b1e831def7e5b065 Mon Sep 17 00:00:00 2001
From: Daniel Mach <dmach@redhat.com>
Date: Tue, 6 Nov 2018 14:31:38 +0100
Subject: [PATCH] [transaction] Fix transaction item lookup for obsoleted packages (RhBug: 1642796)
---
libdnf/dnf-transaction.cpp | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libdnf/dnf-transaction.cpp b/libdnf/dnf-transaction.cpp
index b89eace..2aed9a9 100644
--- a/libdnf/dnf-transaction.cpp
+++ b/libdnf/dnf-transaction.cpp
@@ -713,6 +713,9 @@ dnf_transaction_ts_progress_cb(const void *arg,
case RPMCALLBACK_UNINST_STOP:
pkg = dnf_find_pkg_from_header(priv->remove, hdr);
+ if (pkg == NULL) {
+ pkg = dnf_find_pkg_from_header(priv->remove_helper, hdr);
+ }
if (pkg == NULL && filename != NULL) {
pkg = dnf_find_pkg_from_filename_suffix(priv->remove, filename);
}
--
libgit2 0.26.7

6
libdnf.spec
View File

@ -31,7 +31,7 @@
Name: libdnf
Version: 0.22.0
Release: 7%{?dist}
Release: 8%{?dist}
Summary: Library providing simplified C and Python API to libsolv
License: LGPLv2+
URL: https://github.com/rpm-software-management/libdnf
@ -41,6 +41,7 @@ Patch0002: 0002-history-Fix-crash-in-TransactionItemaddReplacedBy.patch
Patch0003: 0003-swdb-create-persistent-WAL-files-RhBug1640235.patch
Patch0004: 0004-Relocate-ModuleContainer-save-hook-RhBug1632518.patch
Patch0005: 0005-Test-if-sack-is-present-and-run-save-module-persistor-RhBug1632518.patch
Patch0006: 0006-transaction-Fix-transaction-item-lookup-for-obsoleted-packages-RhBug-1642796.patch
BuildRequires: cmake
BuildRequires: gcc
@ -248,6 +249,9 @@ popd
%endif
%changelog
* Wed Nov 07 2018 Jaroslav Mracek <jmracek@redhat.com> - 0.22.0-7
- Backport fixes for RHBZ#1642796 from upstream master
* Tue Oct 30 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 0.22.0-7
- Rebuild for libsolv 0.7