Skip to content

Commit

Permalink
backport: fix outType on gitea dump (#18016)
Browse files Browse the repository at this point in the history
- Backport from #18000

Co-authored-by: techknowlogick <techknowlogick@gitea.io>
  • Loading branch information
Gusted and techknowlogick committed Dec 18, 2021
1 parent a15f0cb commit 711ca52
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions cmd/dump.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ func (o outputType) String() string {
}

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",
}

Expand Down Expand Up @@ -153,12 +153,16 @@ func fatal(format string, args ...interface{}) {
func runDump(ctx *cli.Context) error {
var file *os.File
fileName := ctx.String("file")
outType := ctx.String("type")
if fileName == "-" {
file = os.Stdout
err := log.DelLogger("console")
if err != nil {
fatal("Deleting default logger failed. Can not write to stdout: %v", err)
}
} else {
fileName = strings.TrimSuffix(fileName, path.Ext(fileName))
fileName += "." + outType
}
setting.NewContext()
// make sure we are logging to the console no matter what the configuration tells us do to
Expand Down Expand Up @@ -197,7 +201,6 @@ func runDump(ctx *cli.Context) error {
}

verbose := ctx.Bool("verbose")
outType := ctx.String("type")
var iface interface{}
if fileName == "-" {
iface, err = archiver.ByExtension(fmt.Sprintf(".%s", outType))
Expand Down

0 comments on commit 711ca52

Please sign in to comment.