diff options
author | Steve Winslow <steve@swinslow.net> | 2021-07-04 11:04:40 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-04 11:04:40 -0400 |
commit | fe1c1e7319f0f491c39703d27c3ac30762ff531c (patch) | |
tree | 36a1622f31010ee6414295bed05980468e587475 /tvsaver | |
parent | edbff31685f91a801f64cd23c05b495141b66e60 (diff) | |
parent | 03d00c5759524e0cba2ed0fabcb6e0bb1bdadac2 (diff) | |
download | spdx-tools-fe1c1e7319f0f491c39703d27c3ac30762ff531c.tar.gz |
Merge pull request #88 from swinslow/issue-86
Fix missing colon for excludes in PackageVerificationCode
Diffstat (limited to 'tvsaver')
-rw-r--r-- | tvsaver/saver2v1/save_package.go | 2 | ||||
-rw-r--r-- | tvsaver/saver2v1/save_package_test.go | 2 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_package.go | 2 | ||||
-rw-r--r-- | tvsaver/saver2v2/save_package_test.go | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/tvsaver/saver2v1/save_package.go b/tvsaver/saver2v1/save_package.go index 619fa39..c497404 100644 --- a/tvsaver/saver2v1/save_package.go +++ b/tvsaver/saver2v1/save_package.go @@ -55,7 +55,7 @@ func renderPackage2_1(pkg *spdx.Package2_1, w io.Writer) error { if pkg.PackageVerificationCodeExcludedFile == "" { fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.PackageVerificationCode) } else { - fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) + fmt.Fprintf(w, "PackageVerificationCode: %s (excludes: %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) } } if pkg.PackageChecksumSHA1 != "" { diff --git a/tvsaver/saver2v1/save_package_test.go b/tvsaver/saver2v1/save_package_test.go index fcde876..83f1fd5 100644 --- a/tvsaver/saver2v1/save_package_test.go +++ b/tvsaver/saver2v1/save_package_test.go @@ -84,7 +84,7 @@ PackageSupplier: Organization: John Doe, Inc. PackageOriginator: Person: John Doe PackageDownloadLocation: http://example.com/p1/p1-0.1.0-master.tar.gz FilesAnalyzed: true -PackageVerificationCode: 0123456789abcdef0123456789abcdef01234567 (excludes p1-0.1.0.spdx) +PackageVerificationCode: 0123456789abcdef0123456789abcdef01234567 (excludes: p1-0.1.0.spdx) PackageChecksum: SHA1: 85ed0817af83a24ad8da68c2b5094de69833983c PackageChecksum: SHA256: 11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd PackageChecksum: MD5: 624c1abb3664f4b35547e7c73864ad24 diff --git a/tvsaver/saver2v2/save_package.go b/tvsaver/saver2v2/save_package.go index 518da06..1c74872 100644 --- a/tvsaver/saver2v2/save_package.go +++ b/tvsaver/saver2v2/save_package.go @@ -55,7 +55,7 @@ func renderPackage2_2(pkg *spdx.Package2_2, w io.Writer) error { if pkg.PackageVerificationCodeExcludedFile == "" { fmt.Fprintf(w, "PackageVerificationCode: %s\n", pkg.PackageVerificationCode) } else { - fmt.Fprintf(w, "PackageVerificationCode: %s (excludes %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) + fmt.Fprintf(w, "PackageVerificationCode: %s (excludes: %s)\n", pkg.PackageVerificationCode, pkg.PackageVerificationCodeExcludedFile) } } if pkg.PackageChecksums[spdx.SHA1].Value != "" { diff --git a/tvsaver/saver2v2/save_package_test.go b/tvsaver/saver2v2/save_package_test.go index 8221e73..be16e85 100644 --- a/tvsaver/saver2v2/save_package_test.go +++ b/tvsaver/saver2v2/save_package_test.go @@ -105,7 +105,7 @@ PackageSupplier: Organization: John Doe, Inc. PackageOriginator: Person: John Doe PackageDownloadLocation: http://example.com/p1/p1-0.1.0-master.tar.gz FilesAnalyzed: true -PackageVerificationCode: 0123456789abcdef0123456789abcdef01234567 (excludes p1-0.1.0.spdx) +PackageVerificationCode: 0123456789abcdef0123456789abcdef01234567 (excludes: p1-0.1.0.spdx) PackageChecksum: SHA1: 85ed0817af83a24ad8da68c2b5094de69833983c PackageChecksum: SHA256: 11b6d3ee554eedf79299905a98f9b9a04e498210b59f15094c916c91d150efcd PackageChecksum: MD5: 624c1abb3664f4b35547e7c73864ad24 |