这是indexloc提供的服务,不要输入任何密码
Skip to content

Normalize paths coming from ls tree #891

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 16, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 9 additions & 3 deletions cli/internal/fs/package_deps_hash.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,14 +62,20 @@ func GetPackageDeps(p *PackageDepsOptions) (map[string]string, error) {
filesToHash = append(filesToHash, filepath.Join(p.PackagePath, filename))
}
}
normalized := make(map[string]string)
// These paths are platform-dependent, but already relative to the package root
for platformSpecificPath, hash := range result {
platformIndependentPath := filepath.ToSlash(platformSpecificPath)
normalized[platformIndependentPath] = hash
}
hashes, err := GetHashableDeps(filesToHash, p.PackagePath)
if err != nil {
return nil, err
}
for key, hash := range hashes {
result[key] = hash
for platformIndependentPath, hash := range hashes {
normalized[platformIndependentPath] = hash
}
return result, nil
return normalized, nil
}

// GetHashableDeps hashes the list of given files, then returns a map of normalized path to hash
Expand Down