diff options
| author | Catalin <catalinstratu45@gmail.com> | 2022-03-15 09:47:59 +0200 |
|---|---|---|
| committer | Catalin Stratu <catalinstratu45@gmail.com> | 2022-03-15 11:24:39 +0200 |
| commit | 18d903630e4233f49c3053a484e4c2b4a3d5fe67 (patch) | |
| tree | 029d9c2e6614fe54e6103cc931c4c551dafe674d /builder | |
| parent | 1eaa6c826e6ee2b32de404e1cd82599479dcc5aa (diff) | |
| download | spdx-tools-18d903630e4233f49c3053a484e4c2b4a3d5fe67.tar.gz | |
Fixes for Linux OS
Signed-off-by: Catalin Stratu <catalinstratu45@gmail.com>
Diffstat (limited to 'builder')
| -rw-r--r-- | builder/builder2v1/build_package.go | 7 | ||||
| -rw-r--r-- | builder/builder2v2/build_package.go | 5 |
2 files changed, 6 insertions, 6 deletions
diff --git a/builder/builder2v1/build_package.go b/builder/builder2v1/build_package.go index 0092f48..2093516 100644 --- a/builder/builder2v1/build_package.go +++ b/builder/builder2v1/build_package.go @@ -29,10 +29,11 @@ func BuildPackageSection2_1(packageName string, dirRoot string, pathsIgnore []st } files := map[spdx.ElementID]*spdx.File2_1{} fileNumber := 0 - dirRootLen := len(dirRoot) + //dirRootLen := len(dirRoot) for _, fp := range filepaths { - newFileName := fp[dirRootLen+1:] - newFilePatch := filepath.FromSlash("./" + newFileName) + newFileName := fp + newFilePatch := filepath.FromSlash("." + newFileName) + fmt.Println(newFilePatch) 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 dff43bf..dcba0f7 100644 --- a/builder/builder2v2/build_package.go +++ b/builder/builder2v2/build_package.go @@ -19,6 +19,7 @@ func BuildPackageSection2_2(packageName string, dirRoot string, pathsIgnore []st // build the file section first, so we'll have it available // for calculating the package verification code filepaths, err := utils.GetAllFilePaths(dirRoot, pathsIgnore) + if err != nil { return nil, err } @@ -30,10 +31,8 @@ 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 { - newFileName := fp[dirRootLen:] - newFilePatch := filepath.FromSlash("." + newFileName) + newFilePatch := filepath.FromSlash("." + fp) newFile, err := BuildFileSection2_2(re.ReplaceAllLiteralString(newFilePatch, string(filepath.Separator)), dirRoot, fileNumber) if err != nil { return nil, err |