From da29c52c1523b955442308a3d01560fe2c6baad5 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Wed, 20 Jun 2018 07:54:39 -0400 Subject: Vendor containers/storage for better error reporting on dups Signed-off-by: Daniel J Walsh Closes: #971 Approved by: mheon --- vendor/github.com/containers/storage/containers.go | 4 +++- vendor/github.com/containers/storage/containers_ffjson.go | 1 + vendor/github.com/containers/storage/pkg/directory/directory_unix.go | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) (limited to 'vendor') diff --git a/vendor/github.com/containers/storage/containers.go b/vendor/github.com/containers/storage/containers.go index ec54a502e..ebc1e99a0 100644 --- a/vendor/github.com/containers/storage/containers.go +++ b/vendor/github.com/containers/storage/containers.go @@ -2,6 +2,7 @@ package storage import ( "encoding/json" + "fmt" "io/ioutil" "os" "path/filepath" @@ -278,7 +279,8 @@ func (r *containerStore) Create(id string, names []string, image, layer, metadat names = dedupeNames(names) for _, name := range names { if _, nameInUse := r.byname[name]; nameInUse { - return nil, ErrDuplicateName + return nil, errors.Wrapf(ErrDuplicateName, + fmt.Sprintf("the container name \"%s\" is already in use by \"%s\". You have to remove that container to be able to reuse that name.", name, r.byname[name].ID)) } } if err == nil { diff --git a/vendor/github.com/containers/storage/containers_ffjson.go b/vendor/github.com/containers/storage/containers_ffjson.go index aef6becfe..6e83808d4 100644 --- a/vendor/github.com/containers/storage/containers_ffjson.go +++ b/vendor/github.com/containers/storage/containers_ffjson.go @@ -1,5 +1,6 @@ // Code generated by ffjson . DO NOT EDIT. // source: containers.go +// package storage diff --git a/vendor/github.com/containers/storage/pkg/directory/directory_unix.go b/vendor/github.com/containers/storage/pkg/directory/directory_unix.go index 397251bdb..05522d68b 100644 --- a/vendor/github.com/containers/storage/pkg/directory/directory_unix.go +++ b/vendor/github.com/containers/storage/pkg/directory/directory_unix.go @@ -1,4 +1,4 @@ -// +build linux freebsd solaris +// +build linux darwin freebsd solaris package directory -- cgit v1.2.3-54-g00ecf