diff options
| author | Catalin Stratu <catalinstratu45@gmail.com> | 2022-03-14 20:37:30 +0200 |
|---|---|---|
| committer | Catalin Stratu <catalinstratu45@gmail.com> | 2022-03-15 11:24:39 +0200 |
| commit | 1e3c66b7d68c718739b43efc57cf8eecb5ec9979 (patch) | |
| tree | 58506f89c12a17320b71ae388cc31252cdd1fd09 /builder | |
| parent | 13f9275d24bc9ff81dc14851791cd049f2cbb2d9 (diff) | |
| download | spdx-tools-1e3c66b7d68c718739b43efc57cf8eecb5ec9979.tar.gz | |
Path fixes
Signed-off-by: Catalin Stratu <catalinstratu45@gmail.com>
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder2v1/build_package.go | 4 | ||||
| -rw-r--r-- | builder/builder2v2/build_package.go | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/builder/builder2v1/build_package.go b/builder/builder2v1/build_package.go index c133055..0092f48 100644 --- a/builder/builder2v1/build_package.go +++ b/builder/builder2v1/build_package.go @@ -29,8 +29,10 @@ func BuildPackageSection2_1(packageName string, dirRoot string, pathsIgnore []st } files := map[spdx.ElementID]*spdx.File2_1{} fileNumber := 0 + dirRootLen := len(dirRoot) for _, fp := range filepaths { - newFilePatch := filepath.FromSlash("./" + fp) + newFileName := fp[dirRootLen+1:] + newFilePatch := filepath.FromSlash("./" + newFileName) newFile, err := BuildFileSection2_1(re.ReplaceAllLiteralString(newFilePatch, string(filepath.Separator)), dirRoot, fileNumber) if err != nil { return nil, err diff --git a/builder/builder2v2/build_package.go b/builder/builder2v2/build_package.go index 53b2613..ef4e9a6 100644 --- a/builder/builder2v2/build_package.go +++ b/builder/builder2v2/build_package.go @@ -30,8 +30,10 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st files := map[spdx.ElementID]*spdx.File2_2{} fileNumber := 0 + dirRootLen := len(dirRoot) for _, fp := range filepaths { - newFilePatch := filepath.FromSlash("./" + fp) + newFileName := fp[dirRootLen+1:] + newFilePatch := filepath.FromSlash("./" + newFileName) newFile, err := BuildFileSection2_2(re.ReplaceAllLiteralString(newFilePatch, string(filepath.Separator)), dirRoot, fileNumber) if err != nil { return nil, err |