avoid adding duplicates via different action

This commit is contained in:
eaglegai 2021-12-07 16:23:39 +08:00
parent cc5209a192
commit 1fcf3bb7ed
2 changed files with 23 additions and 2 deletions

View File

@ -0,0 +1,13 @@
diff -ruNa libdnf-0.48.0-org/libdnf/transaction/private/Transaction.cpp libdnf-0.48.0/libdnf/transaction/private/Transaction.cpp
--- libdnf-0.48.0-org/libdnf/transaction/private/Transaction.cpp 2021-12-07 15:39:58.903047892 +0800
+++ libdnf-0.48.0/libdnf/transaction/private/Transaction.cpp 2021-12-07 15:43:19.983719534 +0800
@@ -169,9 +169,6 @@
if (i->getRepoid() != repoid) {
continue;
}
- if (i->getAction() != action) {
- continue;
- }
if (reason > i->getReason()) {
// use the more significant reason
i->setReason(reason);

View File

@ -20,7 +20,7 @@
Name: libdnf
Version: 0.48.0
Release: 3
Release: 4
Summary: Library providing simplified C and Python API to libsolv
License: LGPLv2+
URL: https://github.com/rpm-software-management/libdnf
@ -28,7 +28,9 @@ Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz
Patch0: fix-python2-no-format-arguments-error.patch
Patch1: CVE-2021-3445.patch
%if %{?openEuler:1}0
Patch2: fix-to-avoid-add-duplicates-via-different-action.patch
%endif
BuildRequires: cmake gcc gcc-c++ libsolv-devel >= %{libsolv_version} gettext
BuildRequires: pkgconfig(librepo) >= %{librepo_version} pkgconfig(check)
BuildRequires: pkgconfig(gio-unix-2.0) >= 2.46.0 pkgconfig(gtk-doc) gpgme-devel
@ -208,6 +210,12 @@ popd
%endif
%changelog
* Tue Dec 07 2021 gaihuiying <gaihuiying1@huawei.com> - 0.48.0-4
- Type:bugfix
- ID:NA
- SUG:NA
- DESC:avoid adding duplicates via different action
* Thu Jul 15 2021 gaihuiying <gaihuiying1@huawei.com> - 0.48.0-3
- Type:bugfix
- ID:NA