Compare commits

..

2 Commits

Author SHA1 Message Date
8a8d98b9a5 Bump version to 0.9.66 2023-08-27 11:36:05 -04:00
a92d328874 Fix missing YAML load 2023-08-27 11:35:21 -04:00

View File

@@ -28,7 +28,6 @@ from pkg_resources import get_distribution
from lxml.etree import fromstring, tostring from lxml.etree import fromstring, tostring
from re import sub from re import sub
from yaml import load as yload from yaml import load as yload
from yaml import SafeLoader as SafeYAMLLoader
from pvc.cli.helpers import * from pvc.cli.helpers import *
from pvc.cli.waiters import * from pvc.cli.waiters import *
@@ -4512,7 +4511,7 @@ def cli_provisioner_userdata_add(name, filename):
userdata = filename.read() userdata = filename.read()
filename.close() filename.close()
try: try:
yload(userdata, Loader=SafeYAMLLoader) yload(userdata, Loader=yaml.SafeLoader)
except Exception as e: except Exception as e:
echo("Error: Userdata document is malformed") echo("Error: Userdata document is malformed")
cleanup(False, e) cleanup(False, e)
@@ -4601,7 +4600,7 @@ def cli_provisioner_userdata_modify(name, filename, editor):
filename.close() filename.close()
try: try:
yload(userdata, Loader=SafeYAMLLoader) yload(userdata, Loader=yaml.SafeLoader)
except Exception as e: except Exception as e:
echo("Error: Userdata document is malformed") echo("Error: Userdata document is malformed")
cleanup(False, e) cleanup(False, e)