diff options
| author | Catalin Stratu <catalinstratu45@gmail.com> | 2022-03-14 16:33:33 +0200 |
|---|---|---|
| committer | Catalin Stratu <catalinstratu45@gmail.com> | 2022-03-15 11:24:38 +0200 |
| commit | afc5d6449b2f92e44b423df2f3f1129c43473c53 (patch) | |
| tree | e75d8b1356740f8431fadf3c0e4c7b93649075f9 /builder | |
| parent | 8feaee9eb096b53e99b8b38e0d2a1f6fdf75cbb8 (diff) | |
| download | spdx-tools-afc5d6449b2f92e44b423df2f3f1129c43473c53.tar.gz | |
bug fixes
Signed-off-by: Catalin Stratu <catalinstratu45@gmail.com>
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder2v1/build_package.go | 2 | ||||
| -rw-r--r-- | builder/builder2v2/build_package.go | 2 | ||||
| -rw-r--r-- | builder/builder2v2/build_package_test.go | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/builder/builder2v1/build_package.go b/builder/builder2v1/build_package.go index fa12d0e..ffc5d06 100644 --- a/builder/builder2v1/build_package.go +++ b/builder/builder2v1/build_package.go @@ -26,7 +26,7 @@ func BuildPackageSection2_1(packageName string, dirRoot string, pathsIgnore []st files := map[spdx.ElementID]*spdx.File2_1{} fileNumber := 0 for _, fp := range filepaths { - newFile, err := BuildFileSection2_1(filepath.FromSlash("./"+fp), dirRoot, fileNumber) + newFile, err := BuildFileSection2_1(filepath.FromSlash(filepath.ToSlash("./"+fp)), dirRoot, fileNumber) if err != nil { return nil, err } diff --git a/builder/builder2v2/build_package.go b/builder/builder2v2/build_package.go index ffb7ab3..a5b2206 100644 --- a/builder/builder2v2/build_package.go +++ b/builder/builder2v2/build_package.go @@ -26,7 +26,7 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st files := map[spdx.ElementID]*spdx.File2_2{} fileNumber := 0 for _, fp := range filepaths { - newFile, err := BuildFileSection2_2(filepath.FromSlash("./"+fp), dirRoot, fileNumber) + newFile, err := BuildFileSection2_2(filepath.FromSlash(filepath.ToSlash("./"+fp)), dirRoot, fileNumber) if err != nil { return nil, err } diff --git a/builder/builder2v2/build_package_test.go b/builder/builder2v2/build_package_test.go index 143e8db..f58d6b9 100644 --- a/builder/builder2v2/build_package_test.go +++ b/builder/builder2v2/build_package_test.go @@ -65,7 +65,7 @@ func TestBuilder2_2CanBuildPackageSection(t *testing.T) { if fileEmpty == nil { t.Fatalf("expected non-nil file, got nil") } - if fileEmpty.FileName != "/emptyfile.testdata.txt" { + if fileEmpty.FileName != "./emptyfile.testdata.txt" { t.Errorf("expected %v, got %v", "/emptyfile.testdata.txt", fileEmpty.FileName) } if fileEmpty.FileSPDXIdentifier != spdx.ElementID("File0") { |