diff --git a/.gitignore b/.gitignore index 30ec83d..4927eda 100644 --- a/.gitignore +++ b/.gitignore @@ -31,3 +31,4 @@ /ansible-core-2.15.0rc2.tar.gz /ansible-core-2.15.0.tar.gz /ansible-core-2.15.1.tar.gz +/ansible-core-2.15.2.tar.gz diff --git a/ansible-core.spec b/ansible-core.spec index da50bee..a352d8d 100644 --- a/ansible-core.spec +++ b/ansible-core.spec @@ -10,9 +10,9 @@ Name: ansible-core Summary: A radically simple IT automation system -Version: 2.15.1 +Version: 2.15.2 %global uversion %{version_no_tilde %{quote:%nil}} -Release: 2%{?dist} +Release: 1%{?dist} # The main license is GPLv3+. Many of the files in lib/ansible/module_utils # are BSD licensed. There are various files scattered throughout the codebase # containing code under different licenses. @@ -22,9 +22,6 @@ Source0: https://github.com/ansible/ansible/archive/v%{uversion}/%{name}-%{uvers Source1: build_manpages.py Patch: https://github.com/ansible/ansible/commit/734f38b2594692707d1fd3cbcfc8dc8a677f4ee3.patch#/GALAXY_COLLECTIONS_PATH_WARNINGS.patch -# Fix compat with latest python3-libdnf5 -# dnf5: enable now implemented cacheonly functionality (#81141) -Patch: https://github.com/ansible/ansible/commit/0cc50e067346c357c5177677fba41993950ff044.patch#/dnf5-enable-cacheonly-functionality.patch # urls - remove deprecated client key calls (#80751) # This is needed for Python 3.12, but we apply it unconditionally so # controllers running on older Fedora versions can still work with Python 3.12 @@ -293,6 +290,9 @@ install -Dpm 0644 licenses/* -t %{buildroot}%{_pkglicensedir} %changelog +* Tue Jul 18 2023 Maxwell G - 2.15.2-1 +- Update to 2.15.2. Fixes rhbz#2223469. + * Mon Jul 03 2023 Maxwell G - 2.15.1-2 - Rebuilt for Python 3.12 diff --git a/dnf5-enable-cacheonly-functionality.patch b/dnf5-enable-cacheonly-functionality.patch deleted file mode 100644 index 3aef1d6..0000000 --- a/dnf5-enable-cacheonly-functionality.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 0cc50e067346c357c5177677fba41993950ff044 Mon Sep 17 00:00:00 2001 -From: Martin Krizek -Date: Wed, 28 Jun 2023 16:05:59 +0200 -Subject: [PATCH] dnf5: enable now implemented cacheonly functionality (#81141) - -Note that this also fixes a traceback caused by backwards incompatible -change in dnf5 where cacheonly was changed from bool to string: -https://github.com/rpm-software-management/dnf5/pull/665/files#diff-ab65249ff7fccadfb2864b6826f6559f7f16fad43fd3bf2da0b4fe8db790d59aR179 ---- - changelogs/fragments/dnf5-cacheonly.yml | 2 ++ - lib/ansible/modules/dnf5.py | 3 +-- - test/integration/targets/dnf/tasks/main.yml | 1 - - 3 files changed, 3 insertions(+), 3 deletions(-) - create mode 100644 changelogs/fragments/dnf5-cacheonly.yml - -diff --git a/changelogs/fragments/dnf5-cacheonly.yml b/changelogs/fragments/dnf5-cacheonly.yml -new file mode 100644 -index 00000000000000..b7e2d753fb23dc ---- /dev/null -+++ b/changelogs/fragments/dnf5-cacheonly.yml -@@ -0,0 +1,2 @@ -+minor_changes: -+ - dnf5 - enable now implemented ``cacheonly`` functionality -diff --git a/lib/ansible/modules/dnf5.py b/lib/ansible/modules/dnf5.py -index 362a9a3d804f52..f1653881bea3e3 100644 ---- a/lib/ansible/modules/dnf5.py -+++ b/lib/ansible/modules/dnf5.py -@@ -215,7 +215,6 @@ - default: "no" - cacheonly: - description: -- - This is currently no-op as dnf5 does not implement the feature. - - Tells dnf to run entirely from system cache; does not download or update metadata. - type: bool - default: "no" -@@ -512,7 +511,7 @@ def run(self): - conf.clean_requirements_on_remove = self.autoremove - conf.installroot = self.installroot - conf.use_host_config = True # needed for installroot -- conf.cacheonly = self.cacheonly -+ conf.cacheonly = "all" if self.cacheonly else "none" - if self.download_dir: - conf.destdir = self.download_dir - -diff --git a/test/integration/targets/dnf/tasks/main.yml b/test/integration/targets/dnf/tasks/main.yml -index b84e3389bcf1ca..059bf747c9a31e 100644 ---- a/test/integration/targets/dnf/tasks/main.yml -+++ b/test/integration/targets/dnf/tasks/main.yml -@@ -74,4 +74,3 @@ - when: - - (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or - (ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>=')) -- - not dnf5|default('false') diff --git a/sources b/sources index 3a254d0..f1706a8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (ansible-core-2.15.1.tar.gz) = d1f264670f53c1d412e275bbdb0cf5a607c3e32fa76bd7266029c5c8af78c20b6e929ca6b3c412147adf82bc49de2cb9528f25573c3037f81ca51598152da757 +SHA512 (ansible-core-2.15.2.tar.gz) = 905b6c82f7fcc09f6b776bea9e48568a23d561bac1e3caefe996a5c0f4743cbc3f68913a0ddccf5aeec033f9471df2b06b55d86ed694efc1397730b54d884074