Skip to content

Commit 3c3b656

Browse files
authored
Modify the oss info for local package of cocoapods (#189)
Signed-off-by: Jiyeong Seok <[email protected]>
1 parent 7d78df8 commit 3c3b656

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

src/fosslight_dependency/package_manager/Cocoapods.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ def parse_oss_information(self, f_name):
8686
try:
8787
comment_list = []
8888
deps_list = []
89-
if self.direct_dep:
89+
if self.direct_dep and (len(self.direct_dep_list) > 0):
9090
if pod_oss_name_origin in self.direct_dep_list:
9191
comment_list.append('direct')
9292
else:
@@ -98,10 +98,12 @@ def parse_oss_information(self, f_name):
9898
comment = ','.join(comment_list)
9999
deps = ','.join(deps_list)
100100

101+
oss_name_report = f'{self.package_manager_name}:{pod_oss_name_origin}'
101102
pod_oss_name = pod_oss_name_origin
102103
if '/' in pod_oss_name_origin:
103104
pod_oss_name = pod_oss_name_origin.split('/')[0]
104105
if pod_oss_name in external_source_list:
106+
oss_name_report = pod_oss_name_origin
105107
podspec_filename = pod_oss_name + '.podspec.json'
106108
spec_file_path = os.path.join("Pods", "Local Podspecs", podspec_filename)
107109
else:
@@ -126,13 +128,14 @@ def parse_oss_information(self, f_name):
126128
spec_file_path = os.path.join(file_path_without_version, pod_oss_version, file_path[-1])
127129

128130
oss_name, oss_version, license_name, dn_loc, homepage = self.get_oss_in_podspec(spec_file_path)
131+
if pod_oss_name in external_source_list:
132+
homepage = dn_loc
129133
if oss_name == '':
130134
continue
131135
if pod_oss_version != oss_version:
132136
logger.warning(f'{pod_oss_name_origin} has different version({pod_oss_version})\
133137
with spec version({oss_version})')
134-
sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name),
135-
f'{self.package_manager_name}:{pod_oss_name_origin}',
138+
sheet_list.append([const.SUPPORT_PACKAE.get(self.package_manager_name), oss_name_report,
136139
pod_oss_version, license_name, dn_loc, homepage, '', '', comment, deps])
137140
except Exception as e:
138141
logger.warning(f"Fail to get {pod_oss_name_origin}:{e}")

0 commit comments

Comments
 (0)