diff options
| author | hilimd <68371223+hilimd@users.noreply.github.com> | 2021-05-27 15:48:38 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-27 15:48:38 +0800 |
| commit | ff26e646481a832ff6b75b5efa084935ed1a739b (patch) | |
| tree | e39c62671768cd64e34549aeb6767acc0f965604 /weed/shell | |
| parent | 9524b08becce1e21d5da08884333de3b011f8e4a (diff) | |
| parent | 45bffc92a8e1cf42fdacb20824223e0e4df710f0 (diff) | |
| download | seaweedfs-ff26e646481a832ff6b75b5efa084935ed1a739b.tar.xz seaweedfs-ff26e646481a832ff6b75b5efa084935ed1a739b.zip | |
Merge pull request #78 from chrislusf/master
sync
Diffstat (limited to 'weed/shell')
| -rw-r--r-- | weed/shell/command_fs_meta_save.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_s3_bucket_list.go | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/weed/shell/command_fs_meta_save.go b/weed/shell/command_fs_meta_save.go index 37d94fe42..b6f2a9172 100644 --- a/weed/shell/command_fs_meta_save.go +++ b/weed/shell/command_fs_meta_save.go @@ -38,7 +38,7 @@ func (c *commandFsMetaSave) Help() string { fs.meta.save # save from current directory The meta data will be saved into a local <filer_host>-<port>-<time>.meta file. - These meta data can be later loaded by fs.meta.load command, + These meta data can be later loaded by fs.meta.load command ` } diff --git a/weed/shell/command_s3_bucket_list.go b/weed/shell/command_s3_bucket_list.go index 4acf9a866..0c4e8d18f 100644 --- a/weed/shell/command_s3_bucket_list.go +++ b/weed/shell/command_s3_bucket_list.go @@ -46,6 +46,9 @@ func (c *commandS3BucketList) Do(args []string, commandEnv *CommandEnv, writer i } err = filer_pb.List(commandEnv, filerBucketsPath, "", func(entry *filer_pb.Entry, isLast bool) error { + if !entry.IsDirectory { + return nil + } if entry.Attributes.Replication == "" || entry.Attributes.Replication == "000" { fmt.Fprintf(writer, " %s\n", entry.Name) } else { |