ansible-collections/community.general
1
0
Fork 0
mirror of https://github.com/ansible-collections/community.general.git synced 2025-07-22 12:50:22 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

[PR #8944/a7d1b0fc backport][stable-9] python_runner/django_command: bugfixes (#8946)

Browse source 
python_runner/django_command: bugfixes (#8944)

* python_runner/django_command: bugfixes

* fix indentation

* join path_prefix with : when concatenating with PATH

* add changelog frag

(cherry picked from commit a7d1b0fc52)

Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
patchback[bot] 2024-09-30 17:41:21 +03:00 • committed by GitHub
commit 55d44975dd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
12 changed files with 349 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/module_utils/python_runner.py
View file

@ -22,10 +22,12 @@ class PythonRunner(CmdRunner):
if (os.path.isabs(python) or '/' in python):
self.python = python
elif self.has_venv:
path_prefix = os.path.join(venv, "bin")
if path_prefix is None:
path_prefix = []
path_prefix.append(os.path.join(venv, "bin"))
if environ_update is None:
environ_update = {}
environ_update["PATH"] = "%s:%s" % (path_prefix, os.environ["PATH"])
environ_update["PATH"] = "%s:%s" % (":".join(path_prefix), os.environ["PATH"])
environ_update["VIRTUAL_ENV"] = venv
python_cmd = [self.python] + _ensure_list(command)

5
plugins/modules/django_command.py
View file

@ -57,6 +57,8 @@ run_info:
returned: success and O(verbosity) >= 3
"""
import shlex
from ansible_collections.community.general.plugins.module_utils.django import DjangoModuleHelper
from ansible_collections.community.general.plugins.module_utils.cmd_runner import cmd_runner_fmt
@ -74,6 +76,9 @@ class DjangoCommand(DjangoModuleHelper):
)
django_admin_arg_order = "extra_args"
def __init_module__(self):
self.vars.command = shlex.split(self.vars.command)
def main():
DjangoCommand.execute()