From 023253ad9c5313690cfdbeb8b787396111a72f42 Mon Sep 17 00:00:00 2001 From: missytake Date: Tue, 23 Jul 2024 15:37:35 +0200 Subject: [PATCH] cmdeploy: skip warnings only in pyinfra 3; pyinfra crashes otherwise --- cmdeploy/src/cmdeploy/cmdeploy.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cmdeploy/src/cmdeploy/cmdeploy.py b/cmdeploy/src/cmdeploy/cmdeploy.py index 7e5a201c..3b9def7e 100644 --- a/cmdeploy/src/cmdeploy/cmdeploy.py +++ b/cmdeploy/src/cmdeploy/cmdeploy.py @@ -12,6 +12,9 @@ import shutil import subprocess import sys from pathlib import Path +from packaging import version + +import pyinfra from chatmaild.config import read_config, write_initial_config from termcolor import colored @@ -64,7 +67,9 @@ def run_cmd(args, out): env["CHATMAIL_INI"] = args.inipath deploy_path = importlib.resources.files(__package__).joinpath("deploy.py").resolve() pyinf = "pyinfra --dry" if args.dry_run else "pyinfra" - cmd = f"{pyinf} --ssh-user root {args.config.mail_domain} {deploy_path} -y" + cmd = f"{pyinf} --ssh-user root {args.config.mail_domain} {deploy_path}" + if version.parse(pyinfra.__version__) >= version.parse("3"): + cmd += " -y" retcode = out.check_call(cmd, env=env) if retcode == 0: