Apply util-Correctly-source-errno.EEXIST patch

0004-Fix-defaults-loading.patch

@@ -1,22 +0,0 @@
-From 5842971b6df574b214806fcc286114813d370e1d Mon Sep 17 00:00:00 2001
-From: Daniel Mach <dmach@redhat.com>
-Date: Wed, 18 Apr 2018 16:13:59 +0200
-Subject: [PATCH] Fix defaults loading.
-
----
- dnf/module/metadata_loader.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dnf/module/metadata_loader.py b/dnf/module/metadata_loader.py
-index 78e7f051..150b66f0 100644
---- a/dnf/module/metadata_loader.py
-+++ b/dnf/module/metadata_loader.py
-@@ -61,4 +61,4 @@ class ModuleMetadataLoader(object):
-         if PY3:
-             modules_yaml = modules_yaml.decode("utf-8")
- 
--        return Modulemd.Module.new_all_from_string(modules_yaml)
-+        return Modulemd.Module.new_all_from_string_ext(modules_yaml)
--- 
-2.17.0
-

0004-util-Correctly-source-errno.EEXIST.patch

@@ -0,0 +1,33 @@
+From 199fc9cb11ff004fc752b58b7177aaf8d7fcedfd Mon Sep 17 00:00:00 2001
+From: Neal Gompa <ngompa13@gmail.com>
+Date: Sat, 3 Mar 2018 12:44:54 -0500
+Subject: [PATCH] util: Correctly source errno.EEXIST
+
+---
+ dnf/util.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dnf/util.py b/dnf/util.py
+index ab7fd279..d0f1a4f2 100644
+--- a/dnf/util.py
++++ b/dnf/util.py
+@@ -28,6 +28,7 @@ from functools import reduce
+ import dnf
+ import dnf.const
+ import dnf.pycomp
++import errno
+ import itertools
+ import librepo
+ import locale
+@@ -120,7 +121,7 @@ def ensure_dir(dname):
+     try:
+         os.makedirs(dname, mode=0o755)
+     except OSError as e:
+-        if e.errno != os.errno.EEXIST or not os.path.isdir(dname):
++        if e.errno != errno.EEXIST or not os.path.isdir(dname):
+             raise e
+ 
+ def empty(iterable):
+-- 
+2.17.0
+

dnf.spec

@@ -72,7 +72,7 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        2.7.5
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+ and GPLv2 and GPL
@@ -81,6 +81,7 @@ Source0:        %{url}/archive/%{version}/%{name}-%{version}-modularity-6.tar.gz
 Patch0:         0001-Allow-to-set-cacheonly-from-commands-and-conf-RhBug-.patch
 Patch1:         0002-Remove-redundant-conf-option-cacheonly.patch
 Patch2:         0003-Remove-unnecessary-code-for-set-cacheonly.patch
+Patch3:         0004-util-Correctly-source-errno.EEXIST.patch
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -462,6 +463,9 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 %endif
 
 %changelog
+* Tue May 29 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-15
+- Apply util-Correctly-source-errno.EEXIST patch
+
 * Mon May 28 2018 Martin Hatina <mhatina@redhat.com> - 2.7.5-14
 - Do not require libdnf