From 919af68d3f15a8c7169e55bbc0e365cc52723543 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 28 2018 07:55:32 +0000
Subject: import dnf-2.7.5-19.el7_6


---

diff --git a/SOURCES/0008-system-and-cmdline-repos-hotfixes.patch b/SOURCES/0008-system-and-cmdline-repos-hotfixes.patch
new file mode 100644
index 0000000..c56456e
--- /dev/null
+++ b/SOURCES/0008-system-and-cmdline-repos-hotfixes.patch
@@ -0,0 +1,21 @@
+commit 805859f4a75d5d8118d9a307ee296efe1d9cff2f
+Author: Jaroslav Mracek <jmracek@redhat.com>
+Date:   Mon Sep 24 14:31:26 2018 +0200
+
+    Exclude system and commandline pkg from filtering (RhBug:1630226)
+    
+    https://bugzilla.redhat.com/show_bug.cgi?id=1630226
+
+diff --git a/dnf/base.py b/dnf/base.py
+index 1c41af7a..34ea864e 100644
+--- a/dnf/base.py
++++ b/dnf/base.py
+@@ -294,6 +294,8 @@ class Base(object):
+ 
+         # collect all hotfix repo repoids - we don't filter them at all
+         hotfix_repos = [i.id for i in self.repos.iter_enabled() if i.hotfixes]
++        hotfix_repos.append(hawkey.SYSTEM_REPO_NAME)
++        hotfix_repos.append(hawkey.CMDLINE_REPO_NAME)
+ 
+         # collect all RPM $names for bare RPMs filtering
+         names = {hawkey.split_nevra(i).name for i in include_nevras_set}
diff --git a/SOURCES/0009-Allow-usage-of--C-and-with-modified-cachedir-RhBug1643129.patch b/SOURCES/0009-Allow-usage-of--C-and-with-modified-cachedir-RhBug1643129.patch
new file mode 100644
index 0000000..36a66a3
--- /dev/null
+++ b/SOURCES/0009-Allow-usage-of--C-and-with-modified-cachedir-RhBug1643129.patch
@@ -0,0 +1,28 @@
+From 487b68b0aed495c7154a6b91ffef4452f4333cf7 Mon Sep 17 00:00:00 2001
+From: Jaroslav Mracek <jmracek@redhat.com>
+Date: Mon, 29 Oct 2018 16:53:53 +0100
+Subject: [PATCH] Allow usage of -C and with modified cachedir (RhBug:1643129)
+
+---
+ dnf/cli/cli.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
+index 521b3f3..ff7d80d 100644
+--- a/dnf/cli/cli.py
++++ b/dnf/cli/cli.py
+@@ -810,10 +810,10 @@ class Cli(object):
+ 
+         # Read up configuration options and initialize plugins
+         try:
+-            self.base.conf._configure_from_options(opts)
+             if opts.cacheonly:
+                 self.base.conf.cachedir = self.base.conf.system_cachedir
+                 self.demands.cacheonly = True
++            self.base.conf._configure_from_options(opts)
+             self._read_conf_file(opts.releasever)
+             self.base.conf._adjust_conf_options()
+         except (dnf.exceptions.ConfigError, ValueError) as e:
+--
+libgit2 0.26.7
+
diff --git a/SOURCES/0010-Fix-priority-cachedir-priority-with---cacheonly.patch b/SOURCES/0010-Fix-priority-cachedir-priority-with---cacheonly.patch
new file mode 100644
index 0000000..e3046eb
--- /dev/null
+++ b/SOURCES/0010-Fix-priority-cachedir-priority-with---cacheonly.patch
@@ -0,0 +1,26 @@
+From 5e8a1723a7c93f7f2a564d12a62b52d00d33c446 Mon Sep 17 00:00:00 2001
+From: Jaroslav Mracek <jmracek@redhat.com>
+Date: Tue, 30 Oct 2018 12:53:07 +0100
+Subject: [PATCH] Fix priority cachedir priority with --cacheonly
+
+---
+ dnf/cli/cli.py | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
+index ff7d80d..17a31fc 100644
+--- a/dnf/cli/cli.py
++++ b/dnf/cli/cli.py
+@@ -811,7 +811,8 @@ class Cli(object):
+         # Read up configuration options and initialize plugins
+         try:
+             if opts.cacheonly:
+-                self.base.conf.cachedir = self.base.conf.system_cachedir
++                opt = self.base.conf._get_option("cachedir")
++                opt._set(self.base.conf.system_cachedir, dnf.conf.PRIO_COMMANDLINE)
+                 self.demands.cacheonly = True
+             self.base.conf._configure_from_options(opts)
+             self._read_conf_file(opts.releasever)
+--
+libgit2 0.26.7
+
diff --git a/SPECS/dnf.spec b/SPECS/dnf.spec
index 512bf90..1d75e65 100644
--- a/SPECS/dnf.spec
+++ b/SPECS/dnf.spec
@@ -72,7 +72,7 @@ It supports RPMs, modules and comps groups & environments.
 
 Name:           dnf
 Version:        2.7.5
-Release:        17%{?dist}
+Release:        19%{?dist}
 Summary:        %{pkg_summary}
 # For a breakdown of the licensing, see PACKAGE-LICENSING
 License:        GPLv2+ and GPLv2 and GPL
@@ -84,6 +84,10 @@ Patch2:         0003-Remove-unnecessary-code-for-set-cacheonly.patch
 Patch3:         0005-compatibility-gpgme.patch
 Patch4:         0006-util-Correctly-source-errno.EEXIST.patch
 Patch5:         0007-fix-tests.patch
+Patch6:         0008-system-and-cmdline-repos-hotfixes.patch
+Patch7:         0009-Allow-usage-of--C-and-with-modified-cachedir-RhBug1643129.patch
+Patch8:         0010-Fix-priority-cachedir-priority-with---cacheonly.patch
+
 BuildArch:      noarch
 BuildRequires:  cmake
 BuildRequires:  gettext
@@ -465,6 +469,12 @@ rm -vf %{buildroot}%{_bindir}/dnf-automatic-*
 %endif
 
 %changelog
+* Thu Nov 08 2018 Jaroslav Mracek <jmracek@redhat.com> - 2.7.5-19
+- Backport patches for RHBZ#1643129 from upstream dnf-2-modularity
+
+* Mon Sep 24 2018 Marek Blaha <mblaha@redhat.com> - 2.7.5-18
+- Exclude system and commandline pkg from filtering (RhBug:1630226)
+
 * Mon Jul 23 2018 Marek Blaha <mblaha@redhat.com> - 2.7.5-17
 - Rename yum4 subpackage to nextgen-yum4
 - Correct Source0 URL