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

37 lines
1.0 KiB
Diff
Raw Permalink Normal View History

2022-11-08 06:57:27 +00:00
From 8522c4651678097157fd9f133a451c892021d30b Mon Sep 17 00:00:00 2001
2021-11-09 09:55:53 +00:00
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
2022-11-08 06:57:27 +00:00
index 235aaf28..7e33d4c4 100644
2021-11-09 09:55:53 +00:00
--- 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:
2022-11-08 06:57:27 +00:00
--
2.35.1
2021-11-09 09:55:53 +00:00