From f8f526657eab10cf8532df097e8fd4a5e5817226 Mon Sep 17 00:00:00 2001
From: dongjie110 <17621827400@163.com>
Date: Wed, 25 May 2022 15:30:28 +0800
Subject: [PATCH] =?UTF-8?q?OBS=E5=B7=A5=E7=A8=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E7=BA=B3=E5=85=A5obs=5Fmeta=E7=AE=A1?=
 =?UTF-8?q?=E6=8E=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/project_manager.py | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/core/project_manager.py b/core/project_manager.py
index 64f5ad9..32446a5 100644
--- a/core/project_manager.py
+++ b/core/project_manager.py
@@ -102,14 +102,20 @@ class OBSPrjManager(object):
             log.info(res)
         log.info("create new obs project by meta file %s" % meta_file)
         if os.path.exists(obs_prj_dir):
-            cmd = "osc api -X PUT /source/%s/_meta -T %s" % (name, meta_file)
-            os.system(cmd)
-            cmd = "git add %s && \
-                    git commit -m 'add new obs project by meta file' && \
-                    git push" % obs_prj_dir
-            for i in range(5):
-                if os.system(cmd) == 0:
-                    break
+            if 'prjconf' in meta_file:
+                prj_name = name.replace("prjconf-","")
+                cmd = "osc api -X PUT /source/%s/_config -T %s" % (prj_name, meta_file)
+                os.system(cmd)
+                log.info("create project:%s config file from obs_meta success" % (prj_name))
+            else:
+                cmd = "osc api -X PUT /source/%s/_meta -T %s" % (name, meta_file)
+                os.system(cmd)
+                cmd = "git add %s && \
+                        git commit -m 'add new obs project by meta file' && \
+                        git push" % obs_prj_dir
+                for i in range(5):
+                    if os.system(cmd) == 0:
+                        break
     
     def _change_meta(self, name, meta_file):
         """
@@ -117,8 +123,14 @@ class OBSPrjManager(object):
         name: name of obs project
         meta_file: meta of obs project
         """
-        cmd = "osc api -X PUT /source/%s/_meta -T %s" % (name, meta_file)
-        os.system(cmd)
+        if 'prjconf' in meta_file:
+            prj_name = name.replace("prjconf-","")
+            cmd = "osc api -X PUT /source/%s/_config -T %s" % (prj_name, meta_file)
+            os.system(cmd)
+            log.info("sync project:%s config file from obs_meta success" % (prj_name))
+        else:
+            cmd = "osc api -X PUT /source/%s/_meta -T %s" % (name, meta_file)
+            os.system(cmd)
 
     def _delete(self, sub_dir, branch, name):
         """
-- 
Gitee