docker-library
/
bashbrew
mirror of https://github.com/docker-library/bashbrew.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Invoke "path.Clean" on "Directory" values in go-dockerlibrary itself (instead of only doing so just before "git archive" inside bashbrew)

This commit is contained in:
Tianon Gravi 2019-06-05 15:49:21 -07:00
parent 7e50189a05
commit 7d4d3222cd
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
manifest/rfc2822.go
View File

@ -4,6 +4,7 @@ import (
"bufio" "bufio"
"fmt" "fmt"
"io" "io"
"path"
"regexp" "regexp"
"sort" "sort"
"strings" "strings"
@ -384,6 +385,7 @@ func (manifest *Manifest2822) AddEntry(entry Manifest2822Entry) error {
} }
entry.DeduplicateSharedTags() entry.DeduplicateSharedTags()
entry.Directory = path.Clean(entry.Directory)
if invalidArchitectures := entry.InvalidArchitectures(); len(invalidArchitectures) > 0 { if invalidArchitectures := entry.InvalidArchitectures(); len(invalidArchitectures) > 0 {
return fmt.Errorf("Tags %q has invalid Architectures: %q", entry.TagsString(), strings.Join(invalidArchitectures, ", ")) return fmt.Errorf("Tags %q has invalid Architectures: %q", entry.TagsString(), strings.Join(invalidArchitectures, ", "))