openubmc-bingo 0.6.51__py3-none-any.whl → 0.6.54__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.51'
+__version__ = '0.6.54'

bmcgo/cli/cli.py

@@ -451,14 +451,6 @@ class Command(object):
         """检查当前环境中正在使用的bmc studio版本，
         优先通过pip获取，获取不到通过bmc_studio/mds/server获取
         """
-        package_info = tools.run_command('pip3 show hw_ibmc_bmc_studio', sudo=True, 
-            command_echo=False, ignore_error=True, capture_output=True)
-        version = ""
-        if package_info:
-            version = package_info.stdout.replace("\n", " ")
-        match = re.match(r".*([0-9]+\.[0-9]+\.[0-9]+)", version)
-        if match:
-            return match.group(1)
         studio_path = tools.get_studio_path()
         bmc_studio_conf = os.path.join(f"{studio_path}/mds/service.json")
         if not os.path.isfile(bmc_studio_conf):

bmcgo/utils/component_version_check.py

@@ -94,7 +94,7 @@ class ComponentVersionCheck:
     def get_dict(self):
         self.openubmc_folder()
         self.manifest_dict = self.generate_manifest_dict()
-        self.ibmc_lock_dict = self.generate_ibmc_lock_dict()
+        self.ibmc_lock_dict = self.generate_bmc_lock_dict()
 
     def generate_manifest_dict(self) -> dict:
         """根据 manifest.yml(conan目录) 配置生成 组件名: 组件配置 的字典
@@ -106,8 +106,8 @@ class ComponentVersionCheck:
         manifest_dict = {x[misc.CONAN].split('/')[0]: x[misc.CONAN].split('@')[0] for x in dependency_list}
         return manifest_dict
 
-    def generate_ibmc_lock_dict(self) -> dict:
-        """根据 ibmc.lock 配置生成 组件名: 组件配置 的字典
+    def generate_bmc_lock_dict(self) -> dict:
+        """根据 bmc.lock 配置生成 组件名: 组件配置 的字典
 
         Returns:
             dict: 返回 组件名: 组件配置 的字典
@@ -116,7 +116,7 @@ class ComponentVersionCheck:
             component_list = self.ibmc_lock["graph_lock"]["nodes"]
             ibmc_lock_dict = {x["ref"].split('/')[0]: x["ref"].split('@')[0]
                             for x in [component_conf for _, component_conf in component_list.items()]}
-            ibmc_lock_dict.pop("openubmc")
+            ibmc_lock_dict.pop(misc.community_name())
         else:
             component_list = self.ibmc_lock["requires"]
             ibmc_lock_dict = {x.split('/')[0]: x.split('@')[0] for x in component_list}

bmcgo/utils/config.py

@@ -762,6 +762,8 @@ class Config:
 
     def merge_dependencies(self, dependencies, subsys_comps, base_deps):
         for com_package in dependencies:
+            if "overwrite" in com_package:
+                del com_package["overwrite"]
             com_package_split = com_package.get(misc.CONAN).split("/")
             if len(com_package_split) > 2:
                 continue

bmcgo/utils/tools.py

@@ -245,16 +245,19 @@ class Tools():
         pkg_name = pkg_info[0]
         has_version = len(pkg_info) > 1
         for sub in base_manifest.get(dependency_type, {}):
+            overwrite = sub.get("overwrite", False)
             sub_name = sub.get(misc.CONAN)
             sub_pkg_name = sub_name.split("/")[0]
             # 上下层具有相同组件名的组件
             if pkg_name == sub_pkg_name:
-                if has_version:
+                if not has_version:
+                    com_package[misc.CONAN] = sub_name
+                elif overwrite:
+                    com_package[misc.CONAN] = name
+                else:
                     raise errors.BmcGoException(
                         "配置错误: 不允许删除平台组件或定制平台组件版本号{}".format(name)
                     )
-                else:
-                    com_package[misc.CONAN] = sub_name
                 break
 
     @staticmethod
@@ -630,7 +633,7 @@ class Tools():
         self.run_command(f"chown {user_group} {img_path}", sudo=True)
 
     def get_studio_path(self):
-        ret = self.run_command("whereis bmc_studio", sudo=True, ignore_error=True,
+        ret = self.run_command("whereis bmc_studio", sudo=False, ignore_error=True,
             command_echo=False, capture_output=True).stdout
         if not ret:
             return ""

{openubmc_bingo-0.6.51.dist-info → openubmc_bingo-0.6.54.dist-info}/METADATA

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

{openubmc_bingo-0.6.51.dist-info → openubmc_bingo-0.6.54.dist-info}/RECORD

@@ -1,4 +1,4 @@
-bmcgo/__init__.py,sha256=gPR11fdu-7LXVTAiD7rNONaYFEKBD8FQRCv_fHBZFg4,562
+bmcgo/__init__.py,sha256=Y20uB-lzoOxGYwmJ3S3NWAJ5M7IU3uSDByPsqPFXXCw,562
 bmcgo/bmcgo.py,sha256=uD4TsfjrFB5aQPIS6WRUVc9ShXX-dSImY9ezkB13g1w,685
 bmcgo/bmcgo_config.py,sha256=-HZcTsnccE5wUsgGJ59kq8sDdu8feftIbpyoFvyvBhU,11264
 bmcgo/errors.py,sha256=QW1ndrJcJ2Ws7riOznPKVvZsNlrYk73eZol7w8gJTPU,3076
@@ -7,7 +7,7 @@ bmcgo/logger.py,sha256=rcMqJnyQ5Ag3k04KLEskrG8ZJ508OOU_JH4fMFiGOqQ,6644
 bmcgo/misc.py,sha256=w0vzsD7uzrsxTly5Y1viLgYTKHhLP4sxa499XwbqHnU,6986
 bmcgo/worker.py,sha256=OXz5Gam3pmZjgQeoGJrYy73ZrQszCOxk9X19nbeBI_A,15710
 bmcgo/cli/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
-bmcgo/cli/cli.py,sha256=REX_9QUHPEyrYEQ3BU10py4nssIXkaK0XEpAcY6KejM,27398
+bmcgo/cli/cli.py,sha256=n1871pHyqnbiTS-jQ6hC2G_xKNgPt8hadtXl1B2KMsM,27017
 bmcgo/cli/config.conan2.yaml,sha256=SAtM_6_qOjZbkgUT5fzWbhbq4aWCayqE8o4xJ2vBRww,261
 bmcgo/cli/config.yaml,sha256=tbnFhz2TTrl2-ALpHHujbXB1ymZpjGC4f0zTfqfUZfM,194
 bmcgo/codegen/__init__.py,sha256=eplRBfR_obzVWMQtIeX1RRq6DOEezBx_l1EqcZYLRPM,775
@@ -244,15 +244,15 @@ bmcgo/utils/buffer.py,sha256=t1SkWntWksboNFMPsltslwRdXZi3FAe8eV0JAAE7Vto,4004
 bmcgo/utils/build_conans.py,sha256=3afY0XOwFtfcKud2yp6nODIuPoMKjjsoAl5AV8GbJ6w,8997
 bmcgo/utils/combine_json_schemas.py,sha256=08JrAlLeo_JgUqzYcZNgSwJZPLfjbWVJ4esPPt9bPMY,7967
 bmcgo/utils/component_post.py,sha256=rTSMv36geI6rbm6ZFQenZfG0mn1nVPpdJqn7g8bYtKA,2330
-bmcgo/utils/component_version_check.py,sha256=nKfav7EnJ_JWfCvH_SiyhhIapGXUzhFs1QvLb58MPBs,6266
-bmcgo/utils/config.py,sha256=QFhPR_ndHLrEcdhFP4X8zRNChEl8cIw4rC2W1wQqaec,50989
+bmcgo/utils/component_version_check.py,sha256=ukc-H-A4ljkOShzVtkYWL0oTIYwxgDIZtP-fPqqHnRY,6274
+bmcgo/utils/config.py,sha256=rXk3_UbweJSdDcj8ISgXKJHcjg9erGSPjf9BJ1nODTo,51077
 bmcgo/utils/fetch_component_code.py,sha256=WtPJ5h1nM87X6RicrAhMOJzOzh9A0jD3CbjPc4A-REo,11280
 bmcgo/utils/install_manager.py,sha256=XMZUuIHm7_DWRdLV4dAevsyamQ6rt8lb_7OqGWzNBC8,4927
 bmcgo/utils/json_validator.py,sha256=_k5wU78wfYGrzvSDaqOEtT4otgKUjquVhZNpVf2PW_c,7524
 bmcgo/utils/mapping_config_patch.py,sha256=_gKfZnrvsLPgHn1yXhEJRVTAeuGpeGD9T-Pqyw5Ydys,16827
 bmcgo/utils/merge_csr.py,sha256=JNxHCfW1au84WQshdz0aQy8wMTEOHonjQT3s6LjlZN4,4580
 bmcgo/utils/perf_analysis.py,sha256=fh6lV9AAKVhpPkGPwAJ8EWfGfUoHjqGYQxrvc32Xiac,4767
-bmcgo/utils/tools.py,sha256=xJFmhIQdC2IjqMbVgjcjWOYJk3TwWG0EjN0-FQ4LJ4s,33012
+bmcgo/utils/tools.py,sha256=MmFWnfL1ahRReBb7QaHjLNH3731IXDiBBRiOk9CPsQE,33152
 bmcgo/utils/installations/README.md,sha256=hKXnFYmeHEuROFMFE-vzlGLSHg71bei5ZYwyYZphWNk,2
 bmcgo/utils/installations/__init__.py,sha256=BDXz8BcSlCkfo5UYt6j2rm89-HiYA1ZzfpFhy99MH-0,538
 bmcgo/utils/installations/base_installer.py,sha256=3UZiKWoa41ygRbLD3QsE2FTp-VFp79V0I53QLRIf4E8,5902
@@ -264,8 +264,8 @@ bmcgo/utils/installations/install_plans/qemu.yml,sha256=lT7aKag60QUH6hTGFKa3hGRq
 bmcgo/utils/installations/install_plans/studio.yml,sha256=APR3GM-3Q11LFfe8vh7t3LztDn4LLEpNHRUNjkaVekA,143
 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.51.dist-info/METADATA,sha256=LhSm0RCzavLoRo86bOwXimNKy7gEFCurUCor5ak9dnw,1010
-openubmc_bingo-0.6.51.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-openubmc_bingo-0.6.51.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
-openubmc_bingo-0.6.51.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
-openubmc_bingo-0.6.51.dist-info/RECORD,,
+openubmc_bingo-0.6.54.dist-info/METADATA,sha256=_xhyMb6Ab68CxPxVQ0SIr6xI51VbgHr9n7kDLWLPJds,1010
+openubmc_bingo-0.6.54.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+openubmc_bingo-0.6.54.dist-info/entry_points.txt,sha256=UUoUP-vAWTgg9vEYbRwYqOBHgpRtkngdzMPb-ocz90g,42
+openubmc_bingo-0.6.54.dist-info/top_level.txt,sha256=9AcvCAt1nZcOgMsGt6T07mg2Bgtdet-3mHTwg91axgI,6
+openubmc_bingo-0.6.54.dist-info/RECORD,,