openubmc-bingo 0.6.73__py3-none-any.whl → 0.6.74__py3-none-any.whl

bmcgo/__init__.py

@@ -9,4 +9,4 @@
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
 
-__version__ = '0.6.73'
+__version__ = '0.6.74'

bmcgo/utils/fetch_component_code.py

@@ -15,7 +15,7 @@ import os
 import re
 import shutil
 import subprocess
-from multiprocessing import Pool
+from multiprocessing import Pool, Manager  # <-- 导入 Manager
 import patch_ng
 import yaml
 from git import Repo, exc
@@ -48,6 +48,10 @@ class FetchComponentCode:
              f" -r {misc.conan_remote()} --only None 2>/dev/null"
         if misc.conan_v2():
             cmd = f"conan graph info --requires='{version_range}' --filter {component_name}"
+        
+        # !! 注意：resolve_version_range 也需要加锁，因为它会访问 conan 缓存
+        #    但由于它在 run() 的主进程中串行调用，所以暂时安全。
+        #    如果未来您也想并发化这一步，也必须加锁。
         ret, output = subprocess.getstatusoutput(cmd)
         output = output.strip()
         if ret != 0 or not output:
@@ -202,14 +206,19 @@ class FetchComponentCode:
 
         process_count = min(len(packages_to_fetch), os.cpu_count())
         log.info("创建 %u 个进程拉取代码", process_count)
+
+        # --- 修改：创建并传递锁 ---
+        manager = Manager()
+        conan_lock = manager.Lock()
         pool = Pool(processes=process_count)
         for component_name, conan_version in packages_to_fetch.items():
-            pool.apply_async(func=self.update_component_code, args=(component_name, conan_version),
+            pool.apply_async(func=self.update_component_code, 
+                             args=(component_name, conan_version, conan_lock),  # <-- 传递锁
                              error_callback=process_err_cb)
         pool.close()
         pool.join()
 
-    def update_component_code(self, component_name, conan_version):
+    def update_component_code(self, component_name, conan_version, conan_lock):  # <-- 接收锁
         """
         update component code by conan version
         """
@@ -220,9 +229,12 @@ class FetchComponentCode:
                 version_split = re.split(r'[/, @]', conan_version)
                 conan_dir = os.path.join(os.path.expanduser('~'), '.conan/data/', *version_split, 'export')
                 conandata = os.path.join(conan_dir, 'conandata.yml')
-                if not os.path.exists(conan_dir):
-                    conan_remote_list = tools.get_conan_remote_list(self.remote)
-                    tools.download_conan_recipes(conan_version, conan_remote_list)
+                
+                with conan_lock:  # <-- 在 conan 操作上加锁
+                    if not os.path.exists(conan_dir):
+                        conan_remote_list = tools.get_conan_remote_list(self.remote)
+                        tools.download_conan_recipes(conan_version, conan_remote_list)
+                
                 if os.path.exists(conandata):
                     self.__update_component_code_by_conandata(version_split[0], version_split[1], conandata)
                     return
@@ -234,10 +246,12 @@ class FetchComponentCode:
                     return
                 log.error("conandata(%s) 和 conanfile(%s) 都没有找到", conandata, conanfile)
             else:
-                conan_remote_list = tools.get_conan_remote_list(self.remote)
-                tools.download_conan_recipes(conan_version, conan_remote_list)
-                path_cmd = f"conan cache path {conan_version}"
-                path_cmd_info = Tools().run_command(path_cmd, capture_output=True)
+                path_cmd_info = None
+                with conan_lock:  # <-- 在 conan 操作上加锁
+                    conan_remote_list = tools.get_conan_remote_list(self.remote)
+                    tools.download_conan_recipes(conan_version, conan_remote_list)
+                    path_cmd = f"conan cache path {conan_version}"
+                    path_cmd_info = Tools().run_command(path_cmd, capture_output=True)
 
                 version_split = re.split(r'[/, @]', conan_version)
                 conan_dir = path_cmd_info.stdout.strip()
@@ -249,21 +263,50 @@ class FetchComponentCode:
                 log.error("conandata(%s) 没有找到", conandata)
             log.info("更新组件 %s 代码到 %s 失败, 无法获取到 conan 信息", component_name,
                      conan_version)
-        except exc.GitCommandError as exp:
-            # 尝试修补MDS
-            cmd = f"conan install --requires={conan_version} -r openubmc_dev\
-                  --build=missing -pr profile.ini --format=json --output-folder=tmp"
-            result = json.loads(Tools().run_command(cmd, capture_output=True, ignore_error=True).stdout.strip())
-            nodes = result.get("graph").get("nodes")
+        except exc.GitError as exp:
+            log.warning("Git 操作失败 (组件: %s): %s。 尝试MDS修补...", component_name, exp)
+            command_result = None
+            stdout = ""
+            stderr = ""
+            
+            with conan_lock: # <-- 在 conan install 上加锁
+                cmd = f"conan install --requires={conan_version} -r openubmc_dev\
+                      --build=missing -pr profile.ini --format=json --output-folder=tmp"
+                command_result = Tools().run_command(cmd, capture_output=True, ignore_error=True)
+                stdout = command_result.stdout.strip()
+                stderr = command_result.stderr.strip()
+
+            # --- 健壮的错误检查 ---
+            if command_result.returncode != 0 or not stdout:
+                log.error("MDS修补失败: 'conan install' 命令执行错误 (组件: %s)。", component_name)
+                log.error("Conan STDOUT: %s", stdout)
+                log.error("Conan STDERR: %s", stderr)
+                raise exp  # 重新抛出原始的GitError，因为后备方案失败了
+
+            try:
+                result = json.loads(stdout)
+            except json.JSONDecodeError as json_err:
+                log.error("MDS修补失败: 'conan install' 未返回有效的JSON (组件: %s)。", component_name)
+                log.error("Conan STDOUT: %s", stdout)
+                log.error("JSON 错误: %s", json_err)
+                raise RuntimeError(f"MDS修补失败: JSON解析错误 (组件: {component_name})") from json_err
+            
+            nodes = result.get("graph", {}).get("nodes", {})
+            # --- 检查结束 ---
+
             for node in nodes.values():
-                if node.get("ref").startswith(conan_version):
+                if node.get("ref") and node.get("ref").startswith(conan_version):
                     package_folder = node.get("package_folder")
-                    if os.path.exists(f"{package_folder}/include/mds"):
-                        src = f"{package_folder}/include/mds"
-                        dest = os.path.abspath(f"{component_name}/mds")
-                        shutil.copytree(src, dest, dirs_exist_ok=True)
-                        log.info("将组件 %s 复制到 %s.", component_name, f"{component_name}/mds")            
+                    if package_folder:
+                        if os.path.exists(f"{package_folder}/include/mds"):
+                            src = f"{package_folder}/include/mds"
+                            dest = os.path.abspath(f"{component_name}/mds")
+                            shutil.copytree(src, dest, dirs_exist_ok=True)
+                            log.info("将组件 %s 复制到 %s.", component_name, f"{component_name}/mds")
+                    else:
+                        log.warning("MDS修补: 节点 %s 没有 'package_folder'。", node.get("ref"))
+                        
             shutil.rmtree(f"{self.target_dir}/tmp", ignore_errors=True)
         except Exception as exp:
-            log.error("工作状态错误: %s", exp)
-            log.error("更新组件代码到 %s 失败", conan_version)
+            log.error("工作状态错误 (组件: %s): %s", component_name, exp) # 增加组件名
+            log.error("更新组件 %s 代码到 %s 失败", component_name, conan_version)

{openubmc_bingo-0.6.73.dist-info → openubmc_bingo-0.6.74.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: openubmc-bingo
-Version: 0.6.73
+Version: 0.6.74
 Summary: Tools provided by openubmc
 Home-page: https://openubmc.cn
 Classifier: Programming Language :: Python :: 3

{openubmc_bingo-0.6.73.dist-info → openubmc_bingo-0.6.74.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=dKxwvYrGObODUzVxgVgu5y02h9fNOYaZHT0-1q3_PN0,562
+bmcgo/__init__.py,sha256=yr-QyjX3oYzKiHkvrCjDmfp2vg2JtI2RiAVMPqHSPRQ,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-KYhC3jNqWkCWu6YkyxDZlyC3floXIHaibGpmyB6YWQ,11873
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -245,7 +245,7 @@ bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPP
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
 bmcgo/utils/component_version_check.py,sha256=ukc-H-A4ljkOShzVtkYWL0oTIYwxgDIZtP-fPqqHnRY,6274
 bmcgo/utils/config.py,sha256=BoNx8U8VjnHrC-lFXIhp6Ex8f02kZgUS-mTkRxi_SYM,51141
-bmcgo/utils/fetch_component_code.py,sha256=4C65ct7HdsgaRuF86ifttHQFmGQQCjaA0UhvHdQ8NRY,12329
+bmcgo/utils/fetch_component_code.py,sha256=ESo8gBpW_0BTVOJ-HTqm2GH2A9dnQ3eQEomPZw2sgcU,14599
 bmcgo/utils/install_manager.py,sha256=Ag7tcTbhBfc6aTe5FOiET-8koq8_iY38Sozmi3dquio,4919
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
 bmcgo/utils/mapping_config_patch.py,sha256=ersqH5AmDvSfrOLbsNs3mfBxLQ3AUbJlCAjjtO6dMDk,16909
@@ -263,8 +263,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=AEspVgsVAnmUdvqZYNCb7SPoUEq_0i61dfpauyguLa4,229
 bmcgo/utils/installations/installers/apt_installer.py,sha256=nPaCb4cobSi9InN_aHsEPtQ0k4FgsCUWE5_VgBPvcRE,3769
 bmcgo/utils/installations/installers/pip_installer.py,sha256=dDdios1EQ7fzt90r02pZeoM3jCmjslLzkSvzd2hgRVM,3241
-openubmc_bingo-0.6.73.dist-info/METADATA,sha256=PHXfq2bMBgoUx9je1I5Eovu_Z1ZmXNWXl4VHk54cIDw,1010
-openubmc_bingo-0.6.73.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.73.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.73.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.73.dist-info/RECORD,,
+openubmc_bingo-0.6.74.dist-info/METADATA,sha256=eDgP0VlpyDbnaIoqHHBcZf1CJ14HGZTwhsNf_UvEwdg,1010
+openubmc_bingo-0.6.74.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.74.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.74.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.74.dist-info/RECORD,,