From 125fc8f1f0edf4c26df92a5f3387f4d2ea02b2f9 Mon Sep 17 00:00:00 2001
From: Nick Craig-Wood <nick@craig-wood.com>
Date: Thu, 24 Jul 2014 23:01:04 +0100
Subject: [PATCH] s3: strip trailing / from ListDir()

---
 s3/s3.go | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/s3/s3.go b/s3/s3.go
index ed2bf8cd7..8c0e3f71f 100644
--- a/s3/s3.go
+++ b/s3/s3.go
@@ -281,6 +281,9 @@ func (f *FsS3) list(directories bool, fn func(string, *s3.Key)) {
 					continue
 				}
 				remote := remote[rootLength:]
+				if strings.HasSuffix(remote, "/") {
+					remote = remote[:len(remote)-1]
+				}
 				fn(remote, &s3.Key{Key: remote})
 			}
 		} else {