Merge pull request #29439 from lixiaobing10051267/masterWalk

rectify function and variable referred in pkg/archive/changes_linux.go
Upstream-commit: 545b97e6bc0f7e1be4e7f54604389d7584dc9658
Component: engine
This commit is contained in:
Aaron Lehmann
2016-12-16 17:25:09 -08:00
committed by GitHub

View File

@ -65,7 +65,7 @@ func walkchunk(path string, fi os.FileInfo, dir string, root *FileInfo) error {
}
parent := root.LookUp(filepath.Dir(path))
if parent == nil {
return fmt.Errorf("collectFileInfoForChanges: Unexpectedly no parent for %s", path)
return fmt.Errorf("walkchunk: Unexpectedly no parent for %s", path)
}
info := &FileInfo{
name: filepath.Base(path),