Skip to content

Fix output handling with filesAnalyzed #192

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
lhh wants to merge 2 commits into from
Closed

Fix output handling with filesAnalyzed #192

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
82be1b3
Include filesAnalyzed in machine-readable output
lhh Oct 1, 2021
f2a13d6
Fix filesAnalyzed handling
lhh Oct 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions spdx/writers/jsonyamlxml.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,13 +112,16 @@ def create_package_info(self, package):
package_object["SPDXID"] = self.spdx_id(package.spdx_id)
package_object["name"] = package.name
package_object["downloadLocation"] = package.download_location.__str__()
package_object["packageVerificationCode"] = self.package_verification_code(
package
)
if package.files_analyzed is not None:
package_object["filesAnalyzed"] = package.files_analyzed
if package.files_analyzed is None or package.files_analyzed is True:
package_object["packageVerificationCode"] = self.package_verification_code(
package
)
package_object["licenseInfoFromFiles"] = list(
map(self.license, package.licenses_from_files)
)
package_object["licenseConcluded"] = self.license(package.conc_lics)
package_object["licenseInfoFromFiles"] = list(
map(self.license, package.licenses_from_files)
)
package_object["licenseDeclared"] = self.license(package.license_declared)
package_object["copyrightText"] = package.cr_text.__str__()

Expand Down Expand Up @@ -474,7 +477,9 @@ def create_document(self):
package_objects = []
for package in self.document.packages:
package_info_object = self.create_package_info(package)
package_info_object["files"] = self.create_file_info(package)
# SPDX 2.2 says to omit if filesAnalyzed = False
if package.files:
package_info_object["files"] = self.create_file_info(package)
package_objects.append({"Package": package_info_object})

self.document_object["documentDescribes"] = package_objects
Expand Down