openubmc-bingo 0.6.74__py3-none-any.whl → 0.6.75__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.74'
+__version__ = '0.6.75'

bmcgo/utils/fetch_component_code.py

@@ -15,7 +15,7 @@ import os
 import re
 import shutil
 import subprocess
-from multiprocessing import Pool, Manager  # <-- 导入 Manager
+from multiprocessing import Pool, Manager
 import patch_ng
 import yaml
 from git import Repo, exc
@@ -49,9 +49,6 @@ class FetchComponentCode:
         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:
@@ -118,15 +115,17 @@ class FetchComponentCode:
             log.info(f"{code_dir} 开始应用源码补丁{patch_file}")
             try:
                 FetchComponentCode._apply_patches_direct(real_patch, patch_file, changed_files)
-            except errors.BmcGoException:
-                # 尝试还原文件修改
+            except errors.BmcGoException as e:
                 for a_file, b_file in changed_files.items():
                     cmd = f"git checkout -- {a_file}"
                     tools.run_command(cmd, ignore_error=True)
                     cmd = f"git checkout -- {b_file}"
                     tools.run_command(cmd, ignore_error=True)
-                cmd = "git am " + real_patch
-                tools.run_command(cmd)
+                try:
+                    cmd = "git am " + real_patch
+                    tools.run_command(cmd)
+                except Exception as am_e:
+                    raise RuntimeError(f"git am 恢复补丁 {patch_file} 失败") from am_e
             log.info(f"{code_dir} 应用源码补丁{patch_file}")
         os.chdir(cwd)
 
@@ -189,6 +188,88 @@ class FetchComponentCode:
 
             return revision, url
 
+    # --- 新增：MDS修补方案 1 (Install) ---
+    @staticmethod
+    def _try_mds_install_plan(conan_version, component_name):
+        """
+        尝试使用 'conan install' 来获取 package_folder
+        """
+        log.info(f"MDS修补 (方案1: install): 正在尝试 {conan_version}...")
+        cmd_install = 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_install, 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.warning(f"MDS修补 (方案1: install) 失败: 命令执行失败。 STDERR: {stderr}")
+            raise RuntimeError(f"Install plan failed (command error). stderr: {stderr}")
+
+        try:
+            result = json.loads(stdout)
+            nodes = result.get("graph", {}).get("nodes", {})
+            package_folder = None
+            for node in nodes.values():
+                if node.get("ref") and node.get("ref").startswith(conan_version):
+                    package_folder = node.get("package_folder")
+                    if package_folder:
+                        break
+            
+            if not package_folder:
+                log.warning(f"MDS修补 (方案1: install) 失败: 未在JSON中找到 package_folder。")
+                raise RuntimeError("Install plan failed (JSON parse).")
+            
+            log.info(f"MDS修补 (方案1: install) 成功。 找到 package_folder: {package_folder}")
+            return package_folder # 成功
+        except Exception as json_err:
+            log.warning(f"MDS修补 (方案1: install) 失败: JSON解析错误。 {json_err}")
+            raise RuntimeError(f"Install plan failed (JSON parse).") from json_err
+
+    # --- 新增：MDS修补方案 2 (Download) ---
+    @staticmethod
+    def _try_mds_download_plan(conan_version, component_name):
+        """
+        尝试使用 'conan download' (不带profile) 来获取 package_folder
+        """
+        log.warning(f"MDS修补 (方案1: install) 失败。 切换到 (方案2: download)...")
+        try:
+            cmd_download = f"conan download {conan_version} -r openubmc_dev --format=json"
+            log.info(f"MDS修补 (方案2: download): 执行: {cmd_download}")
+            command_result = tools.run_command(cmd_download, 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(f"MDS修补 (方案2: download) 失败: 命令执行失败。 STDERR: {stderr}")
+                raise RuntimeError(f"Download command failed. STDERR: {stderr}")
+
+            result = json.loads(stdout)
+            local_cache = result.get("Local Cache")
+            component_info = local_cache.get(conan_version)
+            revisions = component_info.get("revisions")
+            first_revision_id = next(iter(revisions))
+            first_revision_data = revisions[first_revision_id]
+            packages = first_revision_data.get("packages")
+            first_package_id = next(iter(packages))
+            full_pref = f"{conan_version}#{first_revision_id}:{first_package_id}"
+            
+            cmd_cache_path = f"conan cache path {full_pref}"
+            log.info(f"MDS修补 (方案2: download): 执行: {cmd_cache_path}")
+            path_cmd_info = tools.run_command(cmd_cache_path, capture_output=True, ignore_error=True)
+            
+            if path_cmd_info.returncode != 0 or not path_cmd_info.stdout:
+                log.error(f"MDS修补 (方案2: download) 失败: 'conan cache path' 失败。 STDERR: {path_cmd_info.stderr.strip()}")
+                raise RuntimeError(f"'conan cache path' 失败. STDERR: {path_cmd_info.stderr.strip()}")
+
+            package_folder = path_cmd_info.stdout.strip()
+            log.info(f"MDS修补 (方案2: download) 成功。 找到 package_folder: {package_folder}")
+            return package_folder # 成功
+
+        except Exception as download_e:
+            log.error(f"MDS修补 (方案2: download) 失败: {download_e}")
+            raise RuntimeError("Download plan failed.") from download_e
+
     def run(self):
         packages_to_fetch = dict()
         for component_name, package in self.packages.items():
@@ -207,18 +288,18 @@ 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, conan_lock),  # <-- 传递锁
+                             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, conan_lock):  # <-- 接收锁
+    def update_component_code(self, component_name, conan_version, conan_lock):
         """
         update component code by conan version
         """
@@ -230,7 +311,7 @@ class FetchComponentCode:
                 conan_dir = os.path.join(os.path.expanduser('~'), '.conan/data/', *version_split, 'export')
                 conandata = os.path.join(conan_dir, 'conandata.yml')
                 
-                with conan_lock:  # <-- 在 conan 操作上加锁
+                with conan_lock:
                     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)
@@ -247,7 +328,7 @@ class FetchComponentCode:
                 log.error("conandata(%s) 和 conanfile(%s) 都没有找到", conandata, conanfile)
             else:
                 path_cmd_info = None
-                with conan_lock:  # <-- 在 conan 操作上加锁
+                with conan_lock:
                     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}"
@@ -265,48 +346,39 @@ class FetchComponentCode:
                      conan_version)
         except exc.GitError as exp:
             log.warning("Git 操作失败 (组件: %s): %s。 尝试MDS修补...", component_name, exp)
-            command_result = None
-            stdout = ""
-            stderr = ""
+            package_folder = None
             
-            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()
+            with conan_lock:
+                try:
+                    # --- 方案 1: install (优先) ---
+                    package_folder = FetchComponentCode._try_mds_install_plan(conan_version, component_name)
+                except Exception as install_e:
+                    # --- 方案 2: download (后备) ---
+                    try:
+                        package_folder = FetchComponentCode._try_mds_download_plan(conan_version, component_name)
+                    except Exception as download_e:
+                        # --- 两个方案都失败了 ---
+                        log.error(f"MDS修补: 方案1 和 方案2 均失败 (组件: {component_name})。")
+                        raise RuntimeError(f"MDS修补方案 'install' 和 'download' 均失败 (组件: {component_name})") from exp
 
-            # --- 健壮的错误检查 ---
-            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
+            # --- 复制步骤 (锁外) ---
+            if package_folder:
+                mds_src_path = f"{package_folder}/include"
+                if os.path.exists(mds_src_path):
+                    src = mds_src_path
+                    dest = os.path.abspath(f"{component_name}")
+                    shutil.copytree(src, dest, dirs_exist_ok=True)
+                    log.info(f"将组件 {component_name} 复制到 {dest}.")
+                else:
+                    log.warning(f"MDS修补: 在 {package_folder} 中未找到 'include/mds'。")
+            else:
+                # 这种情况不应该发生，因为如果两个方案都失败了，上面会抛出异常
+                log.error(f"MDS修补失败 (组件: {component_name}): 未能获取 package_folder。")
+                raise exp # 重新抛出原始 GitError
             
-            nodes = result.get("graph", {}).get("nodes", {})
-            # --- 检查结束 ---
-
-            for node in nodes.values():
-                if node.get("ref") and node.get("ref").startswith(conan_version):
-                    package_folder = node.get("package_folder")
-                    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"))
-                        
+            # 清理 'install' 方案(如果成功)创建的 'tmp' 目录
             shutil.rmtree(f"{self.target_dir}/tmp", ignore_errors=True)
+            
         except Exception as exp:
-            log.error("工作状态错误 (组件: %s): %s", component_name, exp) # 增加组件名
+            log.error("工作状态错误 (组件: %s): %s", component_name, exp)
             log.error("更新组件 %s 代码到 %s 失败", component_name, conan_version)

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

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

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

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=yr-QyjX3oYzKiHkvrCjDmfp2vg2JtI2RiAVMPqHSPRQ,562
+bmcgo/__init__.py,sha256=xYnz0SHAzra5qQuSJQxD6TGJB7iJ727cnjIs0dP1hto,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=ESo8gBpW_0BTVOJ-HTqm2GH2A9dnQ3eQEomPZw2sgcU,14599
+bmcgo/utils/fetch_component_code.py,sha256=ZB-BO88W3di8YDzOB27V7OBgROUOPDgdwn_wlYwZbAg,18195
 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.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,,
+openubmc_bingo-0.6.75.dist-info/METADATA,sha256=TB-LiWbqElLEcOZMHZZCkLCLKGGaScvq35nbXkJAGwg,1010
+openubmc_bingo-0.6.75.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.75.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.75.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.75.dist-info/RECORD,,