Skip to content

Commit

Permalink
Merge pull request #780 from iangregsondev/debugging
Browse files Browse the repository at this point in the history
Fix an issue with using exclude on windows
  • Loading branch information
LandonTClipp authored May 28, 2024
2 parents 2065d36 + 4544845 commit 5a3e47a
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions pkg/config/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -708,8 +708,15 @@ func (c *Config) discoverRecursivePackages(ctx context.Context) error {
subPkgCtx := subPkgLog.WithContext(pkgCtx)

if len(conf.Exclude) > 0 {
p := pathlib.NewPath(subPkg)
relativePath, err := p.RelativeToStr(pkgPath)
// pass in the forward-slash as this is a package and the os.PathSeparator
// cannot be used here as it fails on windows.
p := pathlib.NewPath(subPkg, pathlib.PathWithSeperator("/"))
relativePath, err := p.RelativeTo(
pathlib.NewPath(
pkgPath, pathlib.PathWithAfero(p.Fs()),
pathlib.PathWithSeperator("/"),
),
)
if err != nil {
return stackerr.NewStackErrf(err, "failed to get path for %s relative to %s", subPkg, pkgPath)
}
Expand Down

0 comments on commit 5a3e47a

Please sign in to comment.