MirrorHub/forgejo
0
0
Fork 0
mirror of https://codeberg.org/forgejo/forgejo.git synced 2024-11-25 09:32:44 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix outType on gitea dump (#18000)

Browse source 
- Force to output the dump file to use the given `--type`.
- Resolves #17959
This commit is contained in:
Gusted 2021-12-17 14:38:45 +01:00 committed by GitHub
parent a6d4a8546a
commit 4bbbf35654
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
cmd/dump.go
View file

@ -86,7 +86,7 @@ func (o outputType) String() string {
} }
var outputTypeEnum = &outputType{ var outputTypeEnum = &outputType{
Enum: []string{"zip", "tar", "tar.gz", "tar.xz", "tar.bz2"}, Enum: []string{"zip", "rar", "tar", "sz", "tar.gz", "tar.xz", "tar.bz2", "tar.br", "tar.lz4"},
Default: "zip", Default: "zip",
} }
@ -152,12 +152,16 @@ func fatal(format string, args ...interface{}) {
func runDump(ctx *cli.Context) error { func runDump(ctx *cli.Context) error {
var file *os.File var file *os.File
fileName := ctx.String("file") fileName := ctx.String("file")
outType := ctx.String("type")
if fileName == "-" { if fileName == "-" {
file = os.Stdout file = os.Stdout
err := log.DelLogger("console") err := log.DelLogger("console")
if err != nil { if err != nil {
fatal("Deleting default logger failed. Can not write to stdout: %v", err) fatal("Deleting default logger failed. Can not write to stdout: %v", err)
} }
} else {
fileName = strings.TrimSuffix(fileName, path.Ext(fileName))
fileName += "." + outType
} }
setting.LoadFromExisting() setting.LoadFromExisting()
@ -200,7 +204,6 @@ func runDump(ctx *cli.Context) error {
} }
verbose := ctx.Bool("verbose") verbose := ctx.Bool("verbose")
outType := ctx.String("type")
var iface interface{} var iface interface{}
if fileName == "-" { if fileName == "-" {
iface, err = archiver.ByExtension(fmt.Sprintf(".%s", outType)) iface, err = archiver.ByExtension(fmt.Sprintf(".%s", outType))