Merge pull request #29525 from lixiaobing10051267/masterDiff

Use wrong ApplyLayer in diff_windows.go
Upstream-commit: 2cf32ee04360add15b4431ba55032824ac089349
Component: engine
This commit is contained in:
Akihiro Suda
2016-12-20 12:32:54 +09:00
committed by GitHub

View File

@ -38,7 +38,7 @@ func applyLayerHandler(dest string, layer io.Reader, options *archive.TarOptions
s, err := archive.UnpackLayer(dest, layer, nil)
os.RemoveAll(tmpDir)
if err != nil {
return 0, fmt.Errorf("ApplyLayer %s failed UnpackLayer to %s", err, dest)
return 0, fmt.Errorf("ApplyLayer %s failed UnpackLayer to %s: %s", layer, dest, err)
}
return s, nil