Be compatible with pyyaml 6.x
This commit is contained in:
parent
d83f3c92c6
commit
2888fa60bb
@ -1,11 +1,12 @@
|
|||||||
Name: ansible-runner-service
|
Name: ansible-runner-service
|
||||||
Version: 1.0.7
|
Version: 1.0.7
|
||||||
Release: 3
|
Release: 4
|
||||||
License: ASL 2.0
|
License: ASL 2.0
|
||||||
Summary: RESTful API for ansible/ansible_runner execution
|
Summary: RESTful API for ansible/ansible_runner execution
|
||||||
Source0: https://github.com/ansible/%{name}/archive/%{name}-%{version}.tar.gz
|
Source0: https://github.com/ansible/%{name}/archive/%{name}-%{version}.tar.gz
|
||||||
Patch0: ovirt_log.patch
|
Patch0: ovirt_log.patch
|
||||||
Patch1: wsgi.patch
|
Patch1: wsgi.patch
|
||||||
|
Patch2: be-compatible-with-pyyaml-6.x.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
BuildRequires: systemd python3-devel python3-setuptools
|
BuildRequires: systemd python3-devel python3-setuptools
|
||||||
Requires: ansible
|
Requires: ansible
|
||||||
@ -62,6 +63,9 @@ semanage fcontext -a -t httpd_log_t -s system_u /var/log/ovirt-engine/ansible-ru
|
|||||||
%doc README.md
|
%doc README.md
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Tue Mar 14 2023 wangdi <wangdi@kylinos.cn> - 1.0.7-4
|
||||||
|
- Be compatible with pyyaml 6.x
|
||||||
|
|
||||||
* Tue Mar 14 2023 wangdi <wangdi@kylinos.cn> - 1.0.7-3
|
* Tue Mar 14 2023 wangdi <wangdi@kylinos.cn> - 1.0.7-3
|
||||||
- Add missing requires
|
- Add missing requires
|
||||||
|
|
||||||
|
|||||||
25
be-compatible-with-pyyaml-6.x.patch
Normal file
25
be-compatible-with-pyyaml-6.x.patch
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
From cfb3d7cdb6936afe61018fa2062ae05dcf5b0b2d Mon Sep 17 00:00:00 2001
|
||||||
|
From: wangdi <wangdi@kylinos.cn>
|
||||||
|
Date: Tue, 14 Mar 2023 09:22:33 +0800
|
||||||
|
Subject: [PATCH] be compatible with pyyaml 6.x
|
||||||
|
|
||||||
|
---
|
||||||
|
runner_service/configuration.py | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/runner_service/configuration.py b/runner_service/configuration.py
|
||||||
|
index d7a5c17..71a1307 100644
|
||||||
|
--- a/runner_service/configuration.py
|
||||||
|
+++ b/runner_service/configuration.py
|
||||||
|
@@ -106,7 +106,7 @@ class Config(object):
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(self.config_file, "r") as _cfg:
|
||||||
|
- local_config = yaml.load(_cfg.read())
|
||||||
|
+ local_config = yaml.safe_load(_cfg.read())
|
||||||
|
except yaml.YAMLError as exc:
|
||||||
|
logger.critical("ERROR: YAML error in configuration "
|
||||||
|
"file: {}".format(exc))
|
||||||
|
--
|
||||||
|
2.39.1
|
||||||
|
|
||||||
Loading…
x
Reference in New Issue
Block a user