oss/syft
2
0
Fork 0
mirror of https://github.com/anchore/syft.git synced 2026-11-01 23:16:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix merge conflicts

Browse Source 
Signed-off-by: Kudryavcev Nikolay <kydry.nikolau@gmail.com>
This commit is contained in:
Kudryavcev Nikolay
2025-06-29 21:11:29 +03:00
parent 5879cf9b10
commit 8f784b5dd0
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
syft/internal/fileresolver/directory.go
+2 -2
View File
@@ -173,12 +173,12 @@ loop:
}) })
} }
d.chroot = r.chroot d.Chroot = r.Chroot
d.realPath = currentArchivePath.realPath d.realPath = currentArchivePath.realPath
d.accessPath = currentArchivePath.accessPath d.accessPath = currentArchivePath.accessPath
d.archiveRealPath = archiveDestinationPath d.archiveRealPath = archiveDestinationPath
r.archives = append(r.archives, &d.filetreeResolver) r.archives = append(r.archives, &d.FiletreeResolver)
} }
return nil return nil