Merge pull request #68 from fosslight/develop

Exclude for sbom info yaml file in Lint mode

Author: soimkim

src/fosslight_reuse/_add.py

@@ -188,7 +188,7 @@ def set_missing_license_copyright(missing_license_filtered, missing_copyright_fi
         logger.info("\n# Missing Copyright File(s) ")
         for cop_file in sorted(missing_copyright_filtered):
             logger.info(f"  * {cop_file}")
-            missing_copyright_list.append(cop_file)
+            missing_copyright_list.append(os.path.join(path_to_find, cop_file))
 
         if license == "" and copyright == "":
             input_copyright = input_copyright_while_running()

src/fosslight_reuse/_constant.py

@@ -5,6 +5,6 @@
 
 DEFAULT_EXCLUDE_EXTENSION = ["jar", "png", "exe", "so", "a", "dll", "jpeg", "jpg", "ttf", "lib", "ttc", "pfb",
                              "pfm", "otf", "afm", "dfont", "json"]
-OSS_PKG_INFO_FILES = ["oss-pkg-info.yaml", "oss-pkg-info.yml", "oss-package.info", "requirement.txt",
+OSS_PKG_INFO_FILES = ["oss-pkg-info.yaml", "oss-pkg-info.yml", r"oss-package*.info", "requirement.txt",
                       "requirements.txt", "package.json", "pom.xml", "build.gradle", "podfile.lock", "cartfile.resolved",
-                      "pubspec.yaml", "package.resolved", "go.mod"]
+                      "pubspec.yaml", "package.resolved", "go.mod", r"fosslight-sbom-info*.yaml"]

src/fosslight_reuse/_fosslight_reuse.py

@@ -7,6 +7,7 @@
 import shutil
 import logging
 import locale
+import re
 from datetime import datetime
 from binaryornot.check import is_binary
 import fosslight_util.constant as constant
@@ -42,7 +43,8 @@ def find_oss_pkg_info(path):
                 file_abs_path = os.path.join(root, file)
                 file_rel_path = os.path.relpath(file_abs_path, path)
 
-                if file_lower_case in OSS_PKG_INFO_FILES or file_lower_case.startswith("module_license_"):
+                if any(re.search(re_oss_pkg_pattern, file_lower_case) for re_oss_pkg_pattern in OSS_PKG_INFO_FILES) \
+                   or file_lower_case.startswith("module_license_"):
                     oss_pkg_info.append(file_rel_path)
                 elif is_binary(file_abs_path):
                     DEFAULT_EXCLUDE_EXTENSION_FILES.append(file_rel_path)
@@ -319,15 +321,14 @@ def run_lint(target_path, disable, output_file_name, format='', need_log_file=Tr
         lic_present_files_in_yaml = []
         cop_present_files_in_yaml = []
         excluded_files = []
+        oss_pkg_info = []
         _turn_on_default_reuse_config = not disable
 
         if _check_only_file_mode:
             license_missing_files, copyright_missing_files, project = reuse_for_files(path_to_find, file_to_check_list)
-            oss_pkg_info = []
         else:
-            license_missing_files, copyright_missing_files, oss_pkg_info, project,
-            report, excluded_files, lic_present_files_in_yaml, cop_present_files_in_yaml \
-                = reuse_for_project(path_to_find)
+            license_missing_files, copyright_missing_files, oss_pkg_info, project, \
+                report, excluded_files, lic_present_files_in_yaml, cop_present_files_in_yaml = reuse_for_project(path_to_find)
 
         result_item = result_for_summary(oss_pkg_info,
                                          license_missing_files,