This is an automated email from the ASF dual-hosted git repository. cmcfarlen pushed a commit to branch 10.1.x in repository https://gitbox.apache.org/repos/asf/trafficserver.git
commit 788a5a27440e6cb2b82cb00056f43a81cad6e671 Author: Damian Meden <[email protected]> AuthorDate: Tue Mar 18 10:11:17 2025 +0100 Tools: records 2 yaml script. Make sure the script removes temporary (#12101) file used for the yaml generation. (cherry picked from commit 1423664f43d6f763bf87d493b6c1251b1b20dbcd) --- tools/records/convert2yaml.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/tools/records/convert2yaml.py b/tools/records/convert2yaml.py index 46d2975b3e..0b425f3083 100755 --- a/tools/records/convert2yaml.py +++ b/tools/records/convert2yaml.py @@ -219,7 +219,7 @@ def add_object(config, var, value, type, track_info): add_object(config[key], var[index + 1:], value, type, track_info) -def fix_record_names(file): +def make_tmp_file_with_renamed_fields(file): temp = tempfile.NamedTemporaryFile(prefix='records.config_', delete=False) for l in fileinput.input(files=file): @@ -232,6 +232,7 @@ def fix_record_names(file): rec_line = ' '.join(elements) temp.write(rec_line.encode('utf-8')) temp.write(b'\n') + # Store the record to keep track of the renamed fields. Remapped_Vars[rec_name] = Renamed_Records[rec_name] continue @@ -246,7 +247,7 @@ def handle_file_input(args): config = {} # Fix the names first. - filename = fix_record_names(args.file) + filename = make_tmp_file_with_renamed_fields(args.file) with open(filename, "r+") as f: lines = f.readlines() num_lines = len(lines) @@ -284,6 +285,13 @@ def handle_file_input(args): save_to_file(args.output, args.json, args.typerepr, args.no_backup, ts) f.close() + + # Clean up the temp file we've created with the renamed fields. + try: + os.remove(filename) + except OSError as e: + raise Exception(f"Error removing temporary file {e.filename} - {e.strerror}. YAML file was created") + return
