Merge pull request #29525 from lixiaobing10051267/masterDiff
Use wrong ApplyLayer in diff_windows.go
This commit is contained in:
commit
2cf32ee043
|
@ -38,7 +38,7 @@ func applyLayerHandler(dest string, layer io.Reader, options *archive.TarOptions
|
||||||
s, err := archive.UnpackLayer(dest, layer, nil)
|
s, err := archive.UnpackLayer(dest, layer, nil)
|
||||||
os.RemoveAll(tmpDir)
|
os.RemoveAll(tmpDir)
|
||||||
if err != nil {
|
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
|
return s, nil
|
||||||
|
|
Loading…
Reference in New Issue