From 2e7f7318cc6fab27bf43b37594756040ff15d115 Mon Sep 17 00:00:00 2001
From: Daniel Nephin <dnephin@gmail.com>
Date: Wed, 15 Nov 2017 16:46:27 -0500
Subject: [PATCH] Normalize 'already exists' errors

and fix some error messages where they were wrong or redundant

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
---
 metadata/containers.go   | 2 +-
 metadata/leases.go       | 2 +-
 metadata/snapshot.go     | 4 ++--
 remotes/docker/pusher.go | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/metadata/containers.go b/metadata/containers.go
index c9d8ab646..4cca5f69f 100644
--- a/metadata/containers.go
+++ b/metadata/containers.go
@@ -105,7 +105,7 @@ func (s *containerStore) Create(ctx context.Context, container containers.Contai
 	cbkt, err := bkt.CreateBucket([]byte(container.ID))
 	if err != nil {
 		if err == bolt.ErrBucketExists {
-			err = errors.Wrapf(errdefs.ErrAlreadyExists, "content %q", container.ID)
+			err = errors.Wrapf(errdefs.ErrAlreadyExists, "container %q", container.ID)
 		}
 		return containers.Container{}, err
 	}
diff --git a/metadata/leases.go b/metadata/leases.go
index 006123d45..d397632f8 100644
--- a/metadata/leases.go
+++ b/metadata/leases.go
@@ -55,7 +55,7 @@ func (lm *LeaseManager) Create(ctx context.Context, lid string, labels map[strin
 		if err == bolt.ErrBucketExists {
 			err = errdefs.ErrAlreadyExists
 		}
-		return Lease{}, err
+		return Lease{}, errors.Wrapf(err, "lease %q", lid)
 	}
 
 	t := time.Now().UTC()
diff --git a/metadata/snapshot.go b/metadata/snapshot.go
index 272c2d01a..b06e1f024 100644
--- a/metadata/snapshot.go
+++ b/metadata/snapshot.go
@@ -284,7 +284,7 @@ func (s *snapshotter) createSnapshot(ctx context.Context, key, parent string, re
 		bbkt, err := bkt.CreateBucket([]byte(key))
 		if err != nil {
 			if err == bolt.ErrBucketExists {
-				err = errors.Wrapf(errdefs.ErrAlreadyExists, "snapshot %v already exists", key)
+				err = errors.Wrapf(errdefs.ErrAlreadyExists, "snapshot %q", key)
 			}
 			return err
 		}
@@ -373,7 +373,7 @@ func (s *snapshotter) Commit(ctx context.Context, name, key string, opts ...snap
 		bbkt, err := bkt.CreateBucket([]byte(name))
 		if err != nil {
 			if err == bolt.ErrBucketExists {
-				err = errors.Wrapf(errdefs.ErrAlreadyExists, "snapshot %v already exists", name)
+				err = errors.Wrapf(errdefs.ErrAlreadyExists, "snapshot %q", name)
 			}
 			return err
 		}
diff --git a/remotes/docker/pusher.go b/remotes/docker/pusher.go
index 24bd278a1..c97fd4f73 100644
--- a/remotes/docker/pusher.go
+++ b/remotes/docker/pusher.go
@@ -36,7 +36,7 @@ func (p dockerPusher) Push(ctx context.Context, desc ocispec.Descriptor) (conten
 	status, err := p.tracker.GetStatus(ref)
 	if err == nil {
 		if status.Offset == status.Total {
-			return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "ref %v already exists", ref)
+			return nil, errors.Wrapf(errdefs.ErrAlreadyExists, "ref %v", ref)
 		}
 		// TODO: Handle incomplete status
 	} else if !errdefs.IsNotFound(err) {