From b013c5853720d09c732358ccb28634f2651be327 Mon Sep 17 00:00:00 2001 From: Nick Craig-Wood Date: Thu, 24 Jul 2014 22:51:10 +0100 Subject: [PATCH] swift: return directories without / in ListDir --- swift/swift.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/swift/swift.go b/swift/swift.go index 2bba19238..29f27805d 100644 --- a/swift/swift.go +++ b/swift/swift.go @@ -201,8 +201,11 @@ func (f *FsSwift) list(directories bool, fn func(string, *swift.Object)) { for i := range objects { object := &objects[i] // FIXME if there are no directories, swift gives back the files for some reason! - if directories && !strings.HasSuffix(object.Name, "/") { - continue + if directories { + if !strings.HasSuffix(object.Name, "/") { + continue + } + object.Name = object.Name[:len(object.Name)-1] } if !strings.HasPrefix(object.Name, f.root) { fs.Log(f, "Odd name received %q", object.Name)