From a1f534db628be4e6065f79e17ca11d1ae7b4e971 Mon Sep 17 00:00:00 2001
From: Nicola Sella <nsella@redhat.com>
Date: Thu, 5 Jan 2023 17:24:30 +0100
Subject: [PATCH] Backport patch

Resolves: rhbz#2148871
---
 ...g-variable-files-with-unsupported-en.patch | 50 +++++++++++++++++++
 dnf.spec                                      |  6 ++-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 0005-Ignore-processing-variable-files-with-unsupported-en.patch

diff --git a/0005-Ignore-processing-variable-files-with-unsupported-en.patch b/0005-Ignore-processing-variable-files-with-unsupported-en.patch
new file mode 100644
index 0000000..87b2b81
--- /dev/null
+++ b/0005-Ignore-processing-variable-files-with-unsupported-en.patch
@@ -0,0 +1,50 @@
+From 490cf87dd27926d16fb10735b467cbc490d5c9f1 Mon Sep 17 00:00:00 2001
+From: Jan Kolarik <jkolarik@redhat.com>
+Date: Wed, 23 Nov 2022 08:44:41 +0000
+Subject: [PATCH] Ignore processing variable files with unsupported encoding
+ (RhBug:2141215)
+
+This issue could be seen for example when there are some temporary files stored by text editors in the `/etc/dnf/vars` folder. These files could be in the binary format and causes `UnicodeDecodeError` exception to be thrown during processing of the var files.
+
+= changelog =
+type: bugfix
+resolves: https://bugzilla.redhat.com/show_bug.cgi?id=2141215
+---
+ dnf/conf/substitutions.py | 9 ++++++---
+ 1 file changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/dnf/conf/substitutions.py b/dnf/conf/substitutions.py
+index 1281bdf0..4d0f0d55 100644
+--- a/dnf/conf/substitutions.py
++++ b/dnf/conf/substitutions.py
+@@ -18,13 +18,15 @@
+ # Red Hat, Inc.
+ #
+ 
++import logging
+ import os
+ import re
+ 
+-import dnf
+-import dnf.exceptions
++from dnf.i18n import _
+ 
+ ENVIRONMENT_VARS_RE = re.compile(r'^DNF_VAR_[A-Za-z0-9_]+$')
++logger = logging.getLogger('dnf')
++
+ 
+ class Substitutions(dict):
+     # :api
+@@ -60,7 +62,8 @@ class Substitutions(dict):
+                             val = fp.readline()
+                         if val and val[-1] == '\n':
+                             val = val[:-1]
+-                    except (OSError, IOError):
++                    except (OSError, IOError, UnicodeDecodeError) as e:
++                        logger.warning(_("Error when parsing a variable from file '{0}': {1}").format(filepath, e))
+                         continue
+                 if val is not None:
+                     self[fsvar] = val
+-- 
+2.39.0
+
diff --git a/dnf.spec b/dnf.spec
index 6c529ea..e6374d9 100644
--- a/dnf.spec
+++ b/dnf.spec
@@ -66,7 +66,7 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        4.14.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+
@@ -76,6 +76,7 @@ Patch1:         0001-Pass-whole-URL-in-relativeUrl-to-PackageTarget-for-R.patch
 Patch2:         0002-Document-changes-to-offline-upgrade-command-RhBug-19.patch
 Patch3:         0003-Move-system-upgrade-plugin-to-core-RhBug-2054235.patch
 Patch4:         0004-Fix-plugins-unit-tests.patch
+Patch5:         0005-Ignore-processing-variable-files-with-unsupported-en.patch
 
 BuildArch:      noarch
 BuildRequires:  cmake
@@ -364,6 +365,9 @@ popd
 %{python3_sitelib}/%{name}/automatic/
 
 %changelog
+* Thu Jan 05 2023 Nicola Sella <nsella@redhat.com> - 4.14.0-4
+- Ignore processing variable files with unsupported encoding (RhBug:2148871)
+
 * Wed Dec 03 2022 Nicola Sella <nsella@redhat.com> - 4.14.0-3
 - Move system-upgrade plugin to core (RhBug:2131288)
 - offline-upgrade: add support for security filters (RhBug:1939975,2139326)