github/containerd
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Remove oci package

Browse Source 
Replace functionality in client with simple tar writer

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
This commit is contained in:
Derek McGowan
2017-08-11 10:30:19 -07:00
parent 70c2d367db
commit a437d140f8
5 changed files with 174 additions and 492 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
content/local/writer.go
View File

@@ -8,7 +8,6 @@ import (
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/errdefs"
"github.com/containerd/containerd/oci"
"github.com/opencontainers/go-digest"
"github.com/pkg/errors"
)
@@ -79,7 +78,7 @@ func (w *writer) Commit(size int64, expected digest.Digest) error {
}
if size > 0 && size != fi.Size() {
return oci.ErrUnexpectedSize{Expected: size, Actual: fi.Size()}
return errors.Errorf("unexpected commit size %d, expected %d", fi.Size(), size)
}
if err := w.fp.Close(); err != nil {
@@ -88,7 +87,7 @@ func (w *writer) Commit(size int64, expected digest.Digest) error {
dgst := w.digester.Digest()
if expected != "" && expected != dgst {
return oci.ErrUnexpectedDigest{Expected: expected, Actual: dgst}
return errors.Errorf("unexpected commit digest %s, expected %s", dgst, expected)
}
var (