Skip to content

Refactor to better indicate the program flow #108

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ekohl wants to merge 1 commit into
base: master
Choose a base branch
from
+11 −12
Open

Refactor to better indicate the program flow #108

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions obsah/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -564,24 +564,23 @@ def main(cliargs=None, application_config=ApplicationConfig): # pylint: disable
persist_params.pop(item, None)
yaml.safe_dump(persist_params, persist_file)

# If the command specifies a script, run it directly instead of a playbook
script = args.playbook.metadata.get('script')
if script:
if script := args.playbook.metadata.get('script'):
import subprocess, sys
script_path = os.path.join(application_config.data_path(), script)
parser.exit(subprocess.run([sys.executable, script_path]).returncode)
exit_code = subprocess.run([sys.executable, script_path]).returncode
else:
from ansible.cli.playbook import PlaybookCLI # pylint: disable=all

from ansible.cli.playbook import PlaybookCLI # pylint: disable=all
ansible_args = generate_ansible_args(inventory_path, args, parser.obsah_arguments)
ansible_playbook = (["ansible-playbook"] + ansible_args)

ansible_args = generate_ansible_args(inventory_path, args, parser.obsah_arguments)
ansible_playbook = (["ansible-playbook"] + ansible_args)
if args.verbose:
print("ANSIBLE_CONFIG={}".format(os.environ["ANSIBLE_CONFIG"]), ' '.join(ansible_playbook))

if args.verbose:
print("ANSIBLE_CONFIG={}".format(os.environ["ANSIBLE_CONFIG"]), ' '.join(ansible_playbook))
cli = PlaybookCLI(ansible_playbook)
cli.parse()
exit_code = cli.run()

cli = PlaybookCLI(ansible_playbook)
cli.parse()
exit_code = cli.run()
parser.exit(exit_code)


Expand Down