From 95fc3cb74ca8460370039ef7552e3be770ff334b Mon Sep 17 00:00:00 2001 From: Shreenidhi Shedi Date: Mon, 13 Nov 2023 12:35:58 +0530 Subject: [PATCH] ansible: fix requires & upgrade issue using a playbook. Fixes: https://github.com/vmware/photon/issues/1508 Original author of this fix is: snapshotleisure https://github.com/vmware/photon/pull/1517 Change-Id: I32f1f352dea9d33de88f57a7180cfb1ea30f4f4a Signed-off-by: Shreenidhi Shedi Reviewed-on: http://photon-jenkins.eng.vmware.com:8082/c/photon/+/22342 --- SPECS/ansible/ansible.spec | 6 +++++- SPECS/ansible/tdnf.py | 3 +++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/SPECS/ansible/ansible.spec b/SPECS/ansible/ansible.spec index 17809ad7f3..d12a9f5f90 100644 --- a/SPECS/ansible/ansible.spec +++ b/SPECS/ansible/ansible.spec @@ -1,7 +1,7 @@ Summary: Configuration-management, application deployment, cloud provisioning system Name: ansible Version: 2.14.2 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv3+ URL: https://www.ansible.com Group: Development/Libraries @@ -35,6 +35,7 @@ Requires: python3-PyYAML Requires: python3-xml Requires: python3-paramiko Requires: python3-resolvelib +Requires: python3-curses %description Ansible is a radically simple IT automation system. It handles configuration-management, application deployment, cloud provisioning, ad-hoc task-execution, and multinode orchestration - including trivializing things like zero downtime rolling updates with load balancers. @@ -71,6 +72,9 @@ touch -r %{SOURCE3} %{buildroot}%{_rpmconfigdir}/%{name}_collection.py %{_rpmconfigdir}/%{name}_collection.py %changelog +* Mon Nov 13 2023 Shreenidhi Shedi 2.14.2-2 +- Fix requires +- Fix an issue in upgrade using playbook. * Wed Feb 22 2023 Nitesh Kumar 2.14.2-1 - Version upgrade to v2.14.2 * Fri Dec 16 2022 Nitesh Kumar 2.14.1-1 diff --git a/SPECS/ansible/tdnf.py b/SPECS/ansible/tdnf.py index 90d11b1134..b49273295f 100644 --- a/SPECS/ansible/tdnf.py +++ b/SPECS/ansible/tdnf.py @@ -289,6 +289,9 @@ def convert_to_list(input_list): """Convert nested list into flat list""" flat_list = [] + if not input_list: + return flat_list + for sublist in input_list: if not isinstance(sublist, list): flat_list.append(sublist)