From 8fe3075782b70a1497bcb97ab7eaf82fd4d08bb0 Mon Sep 17 00:00:00 2001 From: orange-snn Date: Wed, 14 Oct 2020 14:19:09 +0800 Subject: [PATCH] add replace_macros in patch match --- advisors/simple_update_robot.py | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/advisors/simple_update_robot.py b/advisors/simple_update_robot.py index f73b1b23..b7e18c39 100755 --- a/advisors/simple_update_robot.py +++ b/advisors/simple_update_robot.py @@ -159,7 +159,7 @@ def download_src(gt_api, pkg, spec, o_ver, n_ver): return result -def modify_patch(repo, patch_match): +def modify_patch(repo, pkg_spec, patch_match): """ delete the patch in spec that has been merged into the new version """ @@ -169,9 +169,10 @@ def modify_patch(repo, patch_match): lines = old_file.readlines() with open(repo + ".spec", "w") as new_file: - for temp_line in lines: - line = "".join(temp_line) - if line.startswith("Patch"): + for pre_line in lines: + temp_line = "".join(pre_line) + if temp_line.startswith("Patch"): + line = replace_macros(temp_line, pkg_spec) patch_name = "".join(line.split(":", 1)[1].split()) patch_num_list = "".join(line.split(":", 1)[0].split()) patch_num = "".join(re.findall(r"\d+\.?\d*", patch_num_list)) @@ -179,7 +180,7 @@ def modify_patch(repo, patch_match): patch_nums.append(patch_num) continue new_file.write(temp_line) - elif line.startswith("%patch"): + elif temp_line.startswith("%patch"): if patch_nums is not None: current_line_num = "".join(line.split(" ", 1)[0].split()) current_patch_num = "".join(re.findall(r"\d+\.?\d*", current_line_num)) @@ -321,7 +322,7 @@ def auto_update_pkg(gt_api, u_pkg, u_branch, u_ver=None): patch_match = match_patches.patches_match(gt_api, u_pkg, pkg_ver, u_ver) os.chdir(os.pardir) if patch_match is not None: - modify_patch(u_pkg, patch_match) + modify_patch(u_pkg, pkg_spec, patch_match) if not build_pkg(u_pkg, u_branch): return -- Gitee