From 95d2c5bb945616cc9069c46f9a525ce1cf199898 Mon Sep 17 00:00:00 2001 From: xuezhou_yan Date: Mon, 15 Apr 2024 20:12:04 +0800 Subject: [PATCH] =?UTF-8?q?issue:#I9GV4B=20=E5=91=BD=E5=90=8D=E8=A7=84?= =?UTF-8?q?=E5=88=99=E4=B8=8D=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: xuezhou_yan --- tools/deps_guard/deps_guard.py | 6 ++++-- tools/deps_guard/elf_file_mgr/elf_walker.py | 16 ++++++++-------- tools/deps_guard/rules_checker/napi_rule.py | 4 ++-- 3 files changed, 14 insertions(+), 12 deletions(-) diff --git a/tools/deps_guard/deps_guard.py b/tools/deps_guard/deps_guard.py index b7352df..7650630 100755 --- a/tools/deps_guard/deps_guard.py +++ b/tools/deps_guard/deps_guard.py @@ -19,7 +19,7 @@ from elf_file_mgr import ElfFileMgr -def __createArgParser(): +def __create_arg_parser(): import argparse parser = argparse.ArgumentParser(description='Check architecture information from compiled output files.') @@ -49,6 +49,7 @@ def _deps_guard_module(out_path, args=None): raise Exception("ERROR: deps_guard failed.") + def _startup_guard_module(out_path, target_cpu, args): import sys import os @@ -62,6 +63,7 @@ def _startup_guard_module(out_path, target_cpu, args): startup_guard(out_path, target_cpu, args) + def deps_guard(out_path, target_cpu, args=None): _deps_guard_module(out_path, args) _startup_guard_module(out_path, target_cpu, args) @@ -69,7 +71,7 @@ def deps_guard(out_path, target_cpu, args=None): if __name__ == '__main__': - parser = __createArgParser() + parser = __create_arg_parser() args = parser.parse_args() _deps_guard_module(args.input, args) diff --git a/tools/deps_guard/elf_file_mgr/elf_walker.py b/tools/deps_guard/elf_file_mgr/elf_walker.py index b070b75..9e47b51 100755 --- a/tools/deps_guard/elf_file_mgr/elf_walker.py +++ b/tools/deps_guard/elf_file_mgr/elf_walker.py @@ -53,20 +53,20 @@ class ELFWalker(): def __walk_path(self, subdir): for root, subdirs, files in os.walk(os.path.join(self._product_out_path, subdir)): for _filename in files: - _assetFile = os.path.join(root, _filename) - if os.path.islink(_assetFile): - if _assetFile.find(".so") > 0: - target = os.readlink(_assetFile) - self._links[_assetFile] = target + _asset_file = os.path.join(root, _filename) + if os.path.islink(_asset_file): + if _asset_file.find(".so") > 0: + target = os.readlink(_asset_file) + self._links[_asset_file] = target continue - if not os.path.isfile(_assetFile): + if not os.path.isfile(_asset_file): continue - with open(_assetFile, "rb") as f: + with open(_asset_file, "rb") as f: data = f.read(4) try: magic = struct.unpack("Bccc", data) if magic[0] == 0x7F and magic[1] == b'E' and magic[2] == b'L' and magic[3] == b'F': - self._files.append(_assetFile) + self._files.append(_asset_file) except: pass diff --git a/tools/deps_guard/rules_checker/napi_rule.py b/tools/deps_guard/rules_checker/napi_rule.py index 173f4a3..b3300ee 100755 --- a/tools/deps_guard/rules_checker/napi_rule.py +++ b/tools/deps_guard/rules_checker/napi_rule.py @@ -40,8 +40,8 @@ class NapiRule(BaseRule): if len(mod["dependedBy"]) == 0: continue - targetName = mod["labelPath"][mod["labelPath"].find(":")+1:] - if targetName in lists: + target_name = mod["labelPath"][mod["labelPath"].find(":")+1:] + if target_name in lists: continue self.error("napi module %s depended by:" % mod["name"]) -- Gitee