From 9189f7a6bfea32b6465517edeb8fca975cb5a061 Mon Sep 17 00:00:00 2001 From: John Helmert III Date: Wed, 8 Jun 2022 16:57:07 -0500 Subject: [PATCH] portage: drop dependency on gentoolkit (provides equery) Portage installs a Python module, which is available anywhere that Portage itself is available. We can use that instead of calling a shell command. Signed-off-by: John Helmert III --- plugins/modules/packaging/os/portage.py | 33 ++++++++++++++++++++----- 1 file changed, 27 insertions(+), 6 deletions(-) diff --git a/plugins/modules/packaging/os/portage.py b/plugins/modules/packaging/os/portage.py index 22f258cf1a..c1cca67623 100644 --- a/plugins/modules/packaging/os/portage.py +++ b/plugins/modules/packaging/os/portage.py @@ -228,11 +228,24 @@ EXAMPLES = ''' import os import re +import sys +import traceback -from ansible.module_utils.basic import AnsibleModule +from ansible.module_utils.basic import AnsibleModule, missing_required_lib +from ansible.module_utils.common.respawn import has_respawned, respawn_module from ansible.module_utils.common.text.converters import to_native +try: + from portage.dbapi import vartree + from portage.exception import InvalidAtom + HAS_PORTAGE = True + PORTAGE_IMPORT_ERROR = None +except ImportError: + HAS_PORTAGE = False + PORTAGE_IMPORT_ERROR = traceback.format_exc() + + def query_package(module, package, action): if package.startswith('@'): return query_set(module, package, action) @@ -240,10 +253,12 @@ def query_package(module, package, action): def query_atom(module, atom, action): - cmd = '%s list %s' % (module.equery_path, atom) - - rc, out, err = module.run_command(cmd) - return rc == 0 + vdb = vartree.vardbapi() + try: + exists = vdb.match(atom) + except InvalidAtom: + return False + return bool(exists) def query_set(module, set, action): @@ -506,8 +521,14 @@ def main(): supports_check_mode=True, ) + if not HAS_PORTAGE: + if sys.executable != '/usr/bin/python' and not has_respawned(): + respawn_module('/usr/bin/python') + else: + module.fail_json(msg=missing_required_lib('portage'), + exception=PORTAGE_IMPORT_ERROR) + module.emerge_path = module.get_bin_path('emerge', required=True) - module.equery_path = module.get_bin_path('equery', required=True) p = module.params