openubmc-bingo 0.6.65__py3-none-any.whl → 0.6.66__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.65'
+__version__ = '0.6.66'

bmcgo/utils/fetch_component_code.py

@@ -10,6 +10,7 @@
 # EITHER EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO NON-INFRINGEMENT,
 # MERCHANTABILITY OR FIT FOR A PARTICULAR PURPOSE.
 # See the Mulan PSL v2 for more details.
+import json
 import os
 import re
 import shutil
@@ -17,7 +18,7 @@ import subprocess
 from multiprocessing import Pool
 import patch_ng
 import yaml
-from git import Repo
+from git import Repo, exc
 
 from bmcgo import errors
 from bmcgo import misc
@@ -248,6 +249,21 @@ 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))
+            nodes = result.stdout.strip().get("graph").get("nodes")
+            for node in nodes.values():
+                if 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")            
+            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 失败", conan_version)

{openubmc_bingo-0.6.65.dist-info → openubmc_bingo-0.6.66.dist-info}/METADATA

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

{openubmc_bingo-0.6.65.dist-info → openubmc_bingo-0.6.66.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=yIAeS2gSBImxb1GEpw8Yw-8_Ppyjv-JWMK1iNM7Vo7c,562
+bmcgo/__init__.py,sha256=35RGOj62SFVkQy27ERD5AR3h542oaBYQIVkYOOwLpfQ,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=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
+bmcgo/utils/fetch_component_code.py,sha256=gLgo3J3s5DyuoKXuOArjxfQZxvCCt_bOWbI6teH5CNQ,12328
 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=rfCfeiEU3WAEMDuUxLDARNjne3pWtK0Bxga3dQrEWoM,16827
@@ -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.65.dist-info/METADATA,sha256=7y81YiuBf2Waa3dzKu5Vq0mME3h9CWjXeCJ2E-_37Hc,1010
-openubmc_bingo-0.6.65.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.65.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.65.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.65.dist-info/RECORD,,
+openubmc_bingo-0.6.66.dist-info/METADATA,sha256=c7qItr-Hvt0Fzra-Q2wtuEN77amPYsFx8gOnGG1tvtg,1010
+openubmc_bingo-0.6.66.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.66.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.66.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.66.dist-info/RECORD,,