kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #28006 from dmcgowan/clean-overlay2-layerstore

Browse source 
Cleanup invalid code in overlay2 and layer store
This commit is contained in:
Vincent Demeester 2016-11-02 23:16:38 -07:00 • committed by GitHub
commit 1f4137857f
2 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
daemon/graphdriver/overlay2/overlay.go
View file

@ -412,7 +412,7 @@ func (d *Driver) getLowerDirs(id string) ([]string, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
lowersArray = append(lowersArray, path.Clean(path.Join(d.home, "link", lp))) lowersArray = append(lowersArray, path.Clean(path.Join(d.home, linkDir, lp)))
} }
} else if !os.IsNotExist(err) { } else if !os.IsNotExist(err) {
return nil, err return nil, err

5
layer/empty.go
View file

@ -24,7 +24,10 @@ func (el *emptyLayer) TarStream() (io.ReadCloser, error) {
return ioutil.NopCloser(buf), nil return ioutil.NopCloser(buf), nil
} }
func (el *emptyLayer) TarStreamFrom(ChainID) (io.ReadCloser, error) { func (el *emptyLayer) TarStreamFrom(p ChainID) (io.ReadCloser, error) {
if p == "" {
return el.TarStream()
}
return nil, fmt.Errorf("can't get parent tar stream of an empty layer") return nil, fmt.Errorf("can't get parent tar stream of an empty layer")
} }