From 3a2d789ed5cc45718bbddba6deaafa1262de803b Mon Sep 17 00:00:00 2001
From: dongjie110 <17621827400@163.com>
Date: Tue, 15 Nov 2022 11:41:26 +0800
Subject: [PATCH] fix create branch tool adapt curren branch dir

---
 tools/modify_src_openeuler_yaml.py | 39 +++++++++++++++---------------
 1 file changed, 19 insertions(+), 20 deletions(-)

diff --git a/tools/modify_src_openeuler_yaml.py b/tools/modify_src_openeuler_yaml.py
index 63420f2..bd48510 100644
--- a/tools/modify_src_openeuler_yaml.py
+++ b/tools/modify_src_openeuler_yaml.py
@@ -25,14 +25,10 @@ import argparse
 
 
 par = argparse.ArgumentParser()
-par.add_argument("-pm", "--pckg_mgmt", default=None,
-        help="pckg_mgmt.yaml file path", required=True)
+par.add_argument("-br", "--branch", default=None,
+        help="which branch you choose", required=True)
 args = par.parse_args()
 
-if not os.path.exists(args.pckg_mgmt):
-    print("The pckg_mgmt.yaml file is not exist!")
-    sys.exit(1)
-
 def git_clone(gitee_repo):
     repo_path = os.path.join(os.getcwd(), gitee_repo)
     if os.path.exists(repo_path):
@@ -53,25 +49,24 @@ def write_yaml(dict_msg, file_path):
     with open(file_path, "w", encoding='utf-8') as f:
         yaml.dump(dict_msg, f, default_flow_style=False, sort_keys=False)
 
-def modify_file_msg(pckg_msg, yaml_path_dict):
+def modify_file_msg(release_management_path, yaml_path_dict):
     modify_list = []
     all_list = []
-    baseos_pkg_list = pckg_msg['packages']['everything']['baseos'] 
-    other_pkg_list = pckg_msg['packages']['everything']['other']
-    epol_pkg_list = pckg_msg['packages']['epol']
-    all_list.extend(baseos_pkg_list)
-    all_list.extend(other_pkg_list)
-    all_list.extend(epol_pkg_list)
-    
+    standard_dirs = ['epol', 'everything-exclude-baseos', 'baseos']
+    for c_dir in standard_dirs:
+        release_path = os.path.join(release_management_path, c_dir, 'pckg-mgmt.yaml')
+        if os.path.exists(release_path):
+            with open(release_path, 'r', encoding='utf-8') as f:
+                result = yaml.load(f, Loader=yaml.FullLoader)
+                all_list.extend(result['packages'])
     for pckg in all_list:
         flag = False
         pkg_name = pckg['name']
-        add_msg = {'name': pckg['branch_to'], 'type': 'protected', 'create_from': pckg['branch_from']}
+        add_msg = {'name': pckg['destination_dir'], 'type': 'protected', 'create_from': pckg['source_dir']}
         openeuler_path = yaml_path_dict.get(pkg_name, "")
-        openeuler_msg = read_yaml(openeuler_path)
-                        
+        openeuler_msg = read_yaml(openeuler_path)           
         for br in openeuler_msg['branches']:
-            if br['name'] == pckg['branch_to']:
+            if br['name'] == pckg['destination_dir']:
                 flag = True
                 break
         if not flag:
@@ -101,8 +96,12 @@ def modify_yaml_file():
     git_clone("release-management")
     src_openeuler_yaml_root = os.path.join(os.getcwd(), "community/sig")
     yaml_dict = get_yaml_path(src_openeuler_yaml_root)
-    pckg_msg = read_yaml(args.pckg_mgmt)
-    modify_file_msg(pckg_msg, yaml_dict)
+    branch = args.branch
+    release_management_path = os.path.join(os.getcwd(), "release-management", branch)
+    if not os.path.exists(release_management_path):
+        print("The branch not exist!")
+        sys.exit(1)
+    modify_file_msg(release_management_path, yaml_dict)
  
 
 modify_yaml_file()
-- 
Gitee