Fix encoding

This commit is contained in:
Justin Hutchings
2022-10-04 14:50:23 -07:00
parent bbe390e048
commit e85ff37e44
3 changed files with 7 additions and 5 deletions

5
dist/index.js generated vendored
View File

@@ -21884,12 +21884,13 @@ function getManifestFromSpdxFile(document, fileName) {
if (purl == null || purl == undefined) {
purl = `pkg:generic/${packageName}@${packageVersion}`;
}
purl = decodeURIComponent(purl);
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships != null && relationships.length > 0) {
manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(decodeURI(purl)));
manifest.addIndirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(purl));
} else {
manifest.addDirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(decodeURI(purl)));
manifest.addDirectDependency(new _github_dependency_submission_toolkit__WEBPACK_IMPORTED_MODULE_0__.Package(purl));
}
});
return manifest;

2
dist/index.js.map generated vendored

File diff suppressed because one or more lines are too long

View File

@@ -47,12 +47,13 @@ function getManifestFromSpdxFile(document, fileName) {
if (purl == null || purl == undefined) {
purl = `pkg:generic/${packageName}@${packageVersion}`;
}
purl = decodeURIComponent(purl);
let relationships = document.relationships?.find(rel => rel.relatedSpdxElement == pkg.SPDXID && rel.relationshipType == "DEPENDS_ON" && rel.spdxElementId != "SPDXRef-RootPackage");
if (relationships != null && relationships.length > 0) {
manifest.addIndirectDependency(new Package(decodeURI(purl)));
manifest.addIndirectDependency(new Package(purl));
} else {
manifest.addDirectDependency(new Package(decodeURI(purl)));
manifest.addDirectDependency(new Package(purl));
}
});
return manifest;