dcavalca / rpms / dnf

Forked from rpms/dnf 2 years ago
Clone

Blame SOURCES/0002-dnf-rpm-miscutils.py-fix-usage-of-_.patch

bc72d2
From 8522c4651678097157fd9f133a451c892021d30b Mon Sep 17 00:00:00 2001
6cc3d3
From: Alexander Kanavin <alex.kanavin@gmail.com>
6cc3d3
Date: Tue, 4 May 2021 22:03:30 +0200
6cc3d3
Subject: [PATCH] dnf/rpm/miscutils.py: fix usage of _()
6cc3d3
6cc3d3
Specifically:
6cc3d3
- an import of _ was missing
6cc3d3
- _ was reused for a different purpose
6cc3d3
---
6cc3d3
 dnf/rpm/miscutils.py | 3 ++-
6cc3d3
 1 file changed, 2 insertions(+), 1 deletion(-)
6cc3d3
6cc3d3
diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py
bc72d2
index 235aaf28..7e33d4c4 100644
6cc3d3
--- a/dnf/rpm/miscutils.py
6cc3d3
+++ b/dnf/rpm/miscutils.py
6cc3d3
@@ -22,6 +22,7 @@ import subprocess
6cc3d3
 import logging
6cc3d3
 
6cc3d3
 from dnf.i18n import ucd
6cc3d3
+from dnf.i18n import _
6cc3d3
 from shutil import which
6cc3d3
 
6cc3d3
 
6cc3d3
@@ -46,7 +47,7 @@ def _verifyPkgUsingRpmkeys(package, installroot):
6cc3d3
             env={'LC_ALL': 'C'},
6cc3d3
             stdout=subprocess.PIPE,
6cc3d3
             cwd='/') as p:
6cc3d3
-        data, _ = p.communicate()
6cc3d3
+        data, err = p.communicate()
6cc3d3
     if p.returncode != 0 or data != (package.encode('ascii', 'strict') + b': digests signatures OK\n'):
6cc3d3
         return 0
6cc3d3
     else:
bc72d2
-- 
bc72d2
2.35.1
6cc3d3