From d50e523d0e6b78b711389732d90f15e8ba2dd71c Mon Sep 17 00:00:00 2001
From: Remi Hardy <remi.hardy@openairinterface.org>
Date: Tue, 1 Sep 2020 13:29:36 +0200
Subject: [PATCH] reworking check of xml_class_list location
---
ci-scripts/main.py | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/ci-scripts/main.py b/ci-scripts/main.py
index 55eb7ad075b..f237d2b0f5b 100644
--- a/ci-scripts/main.py
+++ b/ci-scripts/main.py
@@ -3321,17 +3321,20 @@ def receive_signal(signum, frame):
#loading xml action list from yaml
import yaml
-xml_class_list_file='ci-scripts/xml_class_list.yml'
+xml_class_list_file='xml_class_list.yml'
if (os.path.isfile(xml_class_list_file)):
- #file will be opened only if it exists
- with open(xml_class_list_file,'r') as file:
- # The FullLoader parameter handles the conversion
- #from YAML scalar values to Python dictionary format
- xml_class_list = yaml.load(file,Loader=yaml.FullLoader)
+ yaml_file=xml_class_list_file
+elif (os.path.isfile('ci-scripts/'+xml_class_list_file)):
+ yaml_file='ci-scripts/'+xml_class_list_file
else:
logging.error("XML action list yaml file cannot be found")
sys.exit("XML action list yaml file cannot be found")
+with open(yaml_file,'r') as f:
+ # The FullLoader parameter handles the conversion-$
+ #from YAML scalar values to Python dictionary format$
+ xml_class_list = yaml.load(f,Loader=yaml.FullLoader)
+
mode = ''
--
GitLab