From 7df9e3edef900608c465d83acf283bb919dc080e Mon Sep 17 00:00:00 2001 From: Igor Raits Date: Aug 09 2020 08:29:48 +0000 Subject: Add support for generating '>=' dependencies in RPM generator Signed-off-by: Igor Raits --- diff --git a/ansible-generator b/ansible-generator index ab9baa4..ef7d026 100755 --- a/ansible-generator +++ b/ansible-generator @@ -2,6 +2,7 @@ import argparse import json +import re import sys @@ -28,11 +29,17 @@ def main(): if args.action == "requires": print("(ansible >= 2.9.0 with ansible < 2.10.0)") for dep, req in info.get("dependencies", {}).items(): - if req != "*": - raise NotImplementedError( - "Generation of dependencies different than '*' is not supported yet" - ) - print(f"ansible-collection({dep})") + print(f"ansible-collection({dep})", end="") + if req == "*": + print() + continue + m = re.match(r"^>=(\d+\.\d+\.\d+)$", req) + if m: + print(f" >= {m.group(1)}") + continue + raise NotImplementedError( + "Generation of dependencies different than '*' or '>=' is not supported yet" + ) if __name__ == "__main__": diff --git a/ansible.spec b/ansible.spec index 08b18ba..c0a4750 100644 --- a/ansible.spec +++ b/ansible.spec @@ -18,7 +18,7 @@ Name: ansible Summary: SSH-based configuration management, deployment, and task execution system Version: 2.9.11 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv3+ Source0: https://releases.ansible.com/ansible/%{name}-%{version}.tar.gz @@ -237,6 +237,9 @@ make PYTHON=/usr/bin/python3 tests-py3 %endif %changelog +* Sun Aug 09 2020 Igor Raits - 2.9.11-4 +- Add support for generating '>=' dependencies in RPM generator + * Sat Aug 08 2020 Igor Raits - 2.9.11-3 - Add very basic support for generating dependencies in RPM generator