diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2021-05-24 12:28:19 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-24 12:28:19 +0500 |
| commit | 84dce32a5781268f6dbd0101e3bab65c04e0a1c7 (patch) | |
| tree | 5eb4f327c53e2525d372d19bce62984539c62e71 /weed/shell | |
| parent | bb4263352251fb7ad02cfeb7f340b5b961d0d55a (diff) | |
| parent | 359a08ecbad0b010811af367c2a2677fadfb53ae (diff) | |
| download | seaweedfs-84dce32a5781268f6dbd0101e3bab65c04e0a1c7.tar.xz seaweedfs-84dce32a5781268f6dbd0101e3bab65c04e0a1c7.zip | |
Merge branch 'master' into head_check_all_chunks
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 { |