From f337921714b2837273213a611b9158876680eac0 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jan 11 2022 18:27:34 +0000 Subject: import dnf-4.10.0-2.el9 --- diff --git a/SOURCES/0001-doc-Improve-description-of-multilib_policyall-RhBug19966811995630.patch b/SOURCES/0001-doc-Improve-description-of-multilib_policyall-RhBug19966811995630.patch new file mode 100644 index 0000000..0d1b07a --- /dev/null +++ b/SOURCES/0001-doc-Improve-description-of-multilib_policyall-RhBug19966811995630.patch @@ -0,0 +1,29 @@ +From 39e759ae6afb046cf6d60fb91b3ee208cb150a2f Mon Sep 17 00:00:00 2001 +From: Jaroslav Mracek +Date: Mon, 6 Sep 2021 12:40:59 +0200 +Subject: [PATCH] [doc] Improve description of multilib_policy=all (RhBug:1996681,1995630) + +https://bugzilla.redhat.com/show_bug.cgi?id=1996681 +https://bugzilla.redhat.com/show_bug.cgi?id=1995630 +--- + doc/conf_ref.rst | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/doc/conf_ref.rst b/doc/conf_ref.rst +index fa310e3..60afc86 100644 +--- a/doc/conf_ref.rst ++++ b/doc/conf_ref.rst +@@ -403,7 +403,9 @@ configuration file by your distribution to override the DNF defaults. + ``multilib_policy`` + :ref:`string ` + +- Controls how multilib packages are treated during install operations. Can either be ``"best"`` (the default) for the depsolver to prefer packages which best match the system's architecture, or ``"all"`` to install all available packages with compatible architectures. ++ Controls how multilib packages are treated during install operations. Can either be ``"best"`` (the default) for ++ the depsolver to prefer packages which best match the system's architecture, or ``"all"`` to install packages for ++ all available architectures. + + .. _obsoletes_conf_option-label: + +-- +libgit2 1.1.0 + diff --git a/SOURCES/0002-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch b/SOURCES/0002-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch new file mode 100644 index 0000000..30c4395 --- /dev/null +++ b/SOURCES/0002-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch @@ -0,0 +1,33 @@ +From 9ce65d8575494887a08506583d9d4f05df404fac Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Wed, 20 Oct 2021 09:20:03 +0200 +Subject: [PATCH] Fix: Python dnf API does not respect cacheonly (RhBug:1862970) + +`Repo` object has always been constructed with default synchronization +strategy. The configuration option `cacheonly` was ignored. DNF +application set synchronization strategy later in the `Cli` object +during processing demands. + +The fix takes into account the `cacheonly` option during the construction +of the `Repo` object. Synchronization strategy may still be overriden +during demand processing. +--- + dnf/repo.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/repo.py b/dnf/repo.py +index bb42230..1822cf0 100644 +--- a/dnf/repo.py ++++ b/dnf/repo.py +@@ -434,7 +434,7 @@ class Repo(dnf.conf.RepoConf): + self._pkgdir = None + self._key_import = _NullKeyImport() + self.metadata = None # :api +- self._repo.setSyncStrategy(self.DEFAULT_SYNC) ++ self._repo.setSyncStrategy(SYNC_ONLY_CACHE if parent_conf and parent_conf.cacheonly else self.DEFAULT_SYNC) + if parent_conf: + self._repo.setSubstitutions(parent_conf.substitutions) + self._substitutions = dnf.conf.substitutions.Substitutions() +-- +libgit2 1.1.0 + diff --git a/SOURCES/0003-Documentation-API-notes-for-cacheonly.patch b/SOURCES/0003-Documentation-API-notes-for-cacheonly.patch new file mode 100644 index 0000000..6628678 --- /dev/null +++ b/SOURCES/0003-Documentation-API-notes-for-cacheonly.patch @@ -0,0 +1,26 @@ +From 5c598df3541c21d5c2758c42bd2eb0df8c74eddc Mon Sep 17 00:00:00 2001 +From: Jaroslav Rohel +Date: Fri, 5 Nov 2021 08:52:56 +0100 +Subject: [PATCH] Documentation: API notes for cacheonly + +--- + doc/conf_ref.rst | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/doc/conf_ref.rst b/doc/conf_ref.rst +index 60afc86..1a593a1 100644 +--- a/doc/conf_ref.rst ++++ b/doc/conf_ref.rst +@@ -137,6 +137,9 @@ configuration file by your distribution to override the DNF defaults. + If set to ``True`` DNF will run entirely from system cache, will not update + the cache and will use it even in case it is expired. Default is ``False``. + ++ API Notes: Must be set before repository objects are created. Plugins must set ++ this in the pre_config hook. Later changes are ignored. ++ + .. _check_config_file_age-label: + + ``check_config_file_age`` +-- +libgit2 1.1.0 + diff --git a/SPECS/dnf.spec b/SPECS/dnf.spec index fd586a9..e882081 100644 --- a/SPECS/dnf.spec +++ b/SPECS/dnf.spec @@ -66,12 +66,16 @@ It supports RPMs, modules and comps groups & environments. Name: dnf Version: 4.10.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: %{pkg_summary} # For a breakdown of the licensing, see PACKAGE-LICENSING License: GPLv2+ URL: https://github.com/rpm-software-management/dnf Source0: %{url}/archive/%{version}/%{name}-%{version}.tar.gz +Patch1: 0001-doc-Improve-description-of-multilib_policyall-RhBug19966811995630.patch +Patch2: 0002-Fix-Python-dnf-API-does-not-respect-cacheonly-RhBug1862970.patch +Patch3: 0003-Documentation-API-notes-for-cacheonly.patch + BuildArch: noarch BuildRequires: cmake BuildRequires: gettext @@ -370,6 +374,10 @@ popd %{python3_sitelib}/%{name}/automatic/ %changelog +* Tue Dec 07 2021 Pavla Kratochvilova - 4.10.0-2 +- Respect cacheonly in python dnf API (RhBug:2026849) +- [doc] Improve description of multilib_policy=all (RhBug:1996681,1995630) + * Mon Oct 25 2021 Pavla Kratochvilova - 4.10.0-1 - Update to 4.10.0 - Do not assume that a remote rpm is complete if present