From a889f462235a8a997fccbdb96459a56d4299caff Mon Sep 17 00:00:00 2001
From: Stephen J Day <stephen.day@docker.com>
Date: Tue, 24 Nov 2015 14:23:12 -0800
Subject: [PATCH] storage/driver/s3: correct response on list of missing
 directory

Signed-off-by: Stephen J Day <stephen.day@docker.com>
---
 registry/storage/driver/s3/s3.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/registry/storage/driver/s3/s3.go b/registry/storage/driver/s3/s3.go
index 7672fbdb..a9f303dc 100644
--- a/registry/storage/driver/s3/s3.go
+++ b/registry/storage/driver/s3/s3.go
@@ -685,6 +685,12 @@ func (d *driver) List(ctx context.Context, path string) ([]string, error) {
 		return nil, err
 	}
 
+	if len(listResponse.Contents) == 0 {
+		// Treat empty response as missing directory, since we don't actually
+		// have directories in s3.
+		return nil, storagedriver.PathNotFoundError{Path: path}
+	}
+
 	files := []string{}
 	directories := []string{}