Apply 7d4d3222cd ("path.Clean" earlier so "bashbrew cat" shows the cleaned paths appropriately too)

This commit is contained in:
Tianon Gravi 2019-06-05 15:54:42 -07:00
parent 9f26ec45e1
commit 28a21ad94b
5 changed files with 6 additions and 3 deletions

View File

@ -2,7 +2,7 @@ module bashbrew
require (
github.com/codegangsta/cli v1.20.0
github.com/docker-library/go-dockerlibrary v0.0.0-20190129000321-7e50189a05d4
github.com/docker-library/go-dockerlibrary v0.0.0-20190605224921-7d4d3222cdd1
golang.org/x/crypto v0.0.0-20190325154230-a5d413f7728c // indirect
golang.org/x/sys v0.0.0-20190322080309-f49334f85ddc // indirect
pault.ag/go/debian v0.0.0-20190109175134-a131cb0ae041

View File

@ -2,6 +2,8 @@ github.com/codegangsta/cli v1.20.0 h1:iX1FXEgwzd5+XN6wk5cVHOGQj6Q3Dcp20lUeS4lHNT
github.com/codegangsta/cli v1.20.0/go.mod h1:/qJNoX69yVSKu5o4jLyXAENLRyk1uhi7zkbQ3slBdOA=
github.com/docker-library/go-dockerlibrary v0.0.0-20190129000321-7e50189a05d4 h1:Jl830zF5XyeMipP9Ag2J64TAeheWDvOsqLuaDHn4pb8=
github.com/docker-library/go-dockerlibrary v0.0.0-20190129000321-7e50189a05d4/go.mod h1:ijRhN3WM71dD8TfohKoUdX46BT2uz/Ek5O+5PINI880=
github.com/docker-library/go-dockerlibrary v0.0.0-20190605224921-7d4d3222cdd1 h1:eTBMV614FnFNrm4PKUB+8UtOyrcF1uINuBak//m6YI0=
github.com/docker-library/go-dockerlibrary v0.0.0-20190605224921-7d4d3222cdd1/go.mod h1:ijRhN3WM71dD8TfohKoUdX46BT2uz/Ek5O+5PINI880=
github.com/kjk/lzma v0.0.0-20161016003348-3fd93898850d/go.mod h1:phT/jsRPBAEqjAibu1BurrabCBNTYiVI+zbmyCZJY6Q=
github.com/xi2/xz v0.0.0-20171230120015-48954b6210f8/go.mod h1:HUYIGzjTL3rfEspMxjDjgmT5uz5wzYJKVo23qUhYTos=
golang.org/x/crypto v0.0.0-20190103213133-ff983b9c42bc/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=

View File

@ -61,7 +61,6 @@ func gitStream(args ...string) (io.ReadCloser, error) {
}
func gitArchive(commit string, dir string) (io.ReadCloser, error) {
dir = path.Clean(dir)
if dir == "." {
dir = ""
} else {

View File

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

View File

@ -1,6 +1,6 @@
# github.com/codegangsta/cli v1.20.0
github.com/codegangsta/cli
# github.com/docker-library/go-dockerlibrary v0.0.0-20190129000321-7e50189a05d4
# github.com/docker-library/go-dockerlibrary v0.0.0-20190605224921-7d4d3222cdd1
github.com/docker-library/go-dockerlibrary/architecture
github.com/docker-library/go-dockerlibrary/manifest
github.com/docker-library/go-dockerlibrary/pkg/execpipe