richardphibel / rpms / dnf

Forked from rpms/dnf 2 years ago
Clone

Blame SOURCES/0002-dnfrpmmiscutilspy-fix-usage-of-_.patch

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