From 80bdcdb727c08b3fbdacabae1ca67a70dfc9b2a1 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Mon, 9 Aug 2021 18:20:28 +0000
Subject: [PATCH] import dnf-4.7.0-2.el8

---
 ...002-dnfrpmmiscutilspy-fix-usage-of-_.patch | 36 +++++++++++++++++++
 SPECS/dnf.spec                                |  6 +++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 SOURCES/0002-dnfrpmmiscutilspy-fix-usage-of-_.patch

diff --git a/SOURCES/0002-dnfrpmmiscutilspy-fix-usage-of-_.patch b/SOURCES/0002-dnfrpmmiscutilspy-fix-usage-of-_.patch
new file mode 100644
index 0000000..0089bc6
--- /dev/null
+++ b/SOURCES/0002-dnfrpmmiscutilspy-fix-usage-of-_.patch
@@ -0,0 +1,36 @@
+From 8823feb5f42f8c579fdab80d9e22112b88d0ad2b Mon Sep 17 00:00:00 2001
+From: Alexander Kanavin <alex.kanavin@gmail.com>
+Date: Tue, 4 May 2021 22:03:30 +0200
+Subject: [PATCH] dnf/rpm/miscutils.py: fix usage of _()
+
+Specifically:
+- an import of _ was missing
+- _ was reused for a different purpose
+---
+ dnf/rpm/miscutils.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py
+index 235aaf2..7e33d4c 100644
+--- a/dnf/rpm/miscutils.py
++++ b/dnf/rpm/miscutils.py
+@@ -22,6 +22,7 @@ import subprocess
+ import logging
+ 
+ from dnf.i18n import ucd
++from dnf.i18n import _
+ from shutil import which
+ 
+ 
+@@ -46,7 +47,7 @@ def _verifyPkgUsingRpmkeys(package, installroot):
+             env={'LC_ALL': 'C'},
+             stdout=subprocess.PIPE,
+             cwd='/') as p:
+-        data, _ = p.communicate()
++        data, err = p.communicate()
+     if p.returncode != 0 or data != (package.encode('ascii', 'strict') + b': digests signatures OK\n'):
+         return 0
+     else:
+--
+libgit2 1.0.1
+
diff --git a/SPECS/dnf.spec b/SPECS/dnf.spec
index 89825db..d8229fc 100644
--- a/SPECS/dnf.spec
+++ b/SPECS/dnf.spec
@@ -66,13 +66,14 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        4.7.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+
 URL:            https://github.com/rpm-software-management/dnf
 Source0:        %{url}/archive/%{version}/%{name}-%{version}.tar.gz
 Patch1:         0001-Set-top-level-directory-for-unittest.patch
+Patch2:         0002-dnfrpmmiscutilspy-fix-usage-of-_.patch
 
 BuildArch:      noarch
 BuildRequires:  cmake
@@ -372,6 +373,9 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Tue Jul 27 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 4.7.0-2
+- Fix covscan issue: dnf/rpm/miscutils.py: fix usage of _()
+
 * Wed May 19 2021 Pavla Kratochvilova <pkratoch@redhat.com> - 4.7.0-1
 - Update to 4.7.0
 - New optional parameter for filter_modules enables following modular obsoletes based on a config option module_obsoletes