oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2025-11-18 08:53:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

resolvers: do not join paths, it is assumed they are already joined

Browse Source 
Signed-off-by: Alfredo Deza <adeza@anchore.com>
This commit is contained in:
Alfredo Deza 2020-07-16 13:12:42 -04:00
parent d82a0872c9
commit a05d58686e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgbom/scope/resolvers/directory_resolver.go
View File

@ -74,14 +74,8 @@ func (s DirectoryResolver) FilesByGlob(patterns ...string) ([]file.Reference, er
func (s DirectoryResolver) MultipleFileContentsByRef(f ...file.Reference) (map[file.Reference]string, error) { func (s DirectoryResolver) MultipleFileContentsByRef(f ...file.Reference) (map[file.Reference]string, error) {
refContents := make(map[file.Reference]string) refContents := make(map[file.Reference]string)
for _, fileRef := range f { for _, fileRef := range f {
resolvedPath := path.Join(s.Path, string(fileRef.Path)) contents, err := fileContents(fileRef.Path)
_, err := os.Stat(resolvedPath)
if os.IsNotExist(err) {
continue
} else if err != nil {
log.Errorf("path (%s) is not valid: %v", resolvedPath, err)
}
contents, err := fileContents(file.Path(resolvedPath))
if err != nil { if err != nil {
return refContents, fmt.Errorf("could not read contents of file: %s", fileRef.Path) return refContents, fmt.Errorf("could not read contents of file: %s", fileRef.Path)
} }