cmd/import: improve error message

- Print app.Run() error
pull/5843/head
Unknwon 2019-10-26 01:48:19 -07:00
parent 762e1167c7
commit 1cfdd1283a
No known key found for this signature in database
GPG Key ID: B43718D76E30A238
3 changed files with 11 additions and 7 deletions

View File

@ -11,12 +11,13 @@ import (
"os"
"github.com/urfave/cli"
log "gopkg.in/clog.v1"
"gogs.io/gogs/internal/cmd"
"gogs.io/gogs/internal/setting"
)
const Version = "0.11.96.1024"
const Version = "0.11.96.1026"
func init() {
setting.AppVer = Version
@ -37,5 +38,7 @@ func main() {
cmd.Backup,
cmd.Restore,
}
app.Run(os.Args)
if err := app.Run(os.Args); err != nil {
log.Fatal(2, "Failed to run: %v", err)
}
}

View File

@ -7,6 +7,7 @@ package cmd
import (
"bufio"
"bytes"
"errors"
"fmt"
"os"
"path/filepath"
@ -43,14 +44,14 @@ without manually hacking the data files`,
func runImportLocale(c *cli.Context) error {
if !c.IsSet("source") {
return fmt.Errorf("Source directory is not specified")
return errors.New("source directory is not specified")
} else if !c.IsSet("target") {
return fmt.Errorf("Target directory is not specified")
return errors.New("target directory is not specified")
}
if !com.IsDir(c.String("source")) {
return fmt.Errorf("Source directory does not exist or is not a directory")
return fmt.Errorf("source directory %q does not exist or is not a directory", c.String("source"))
} else if !com.IsDir(c.String("target")) {
return fmt.Errorf("Target directory does not exist or is not a directory")
return fmt.Errorf("target directory %q does not exist or is not a directory", c.String("target"))
}
if c.IsSet("config") {

View File

@ -1 +1 @@
0.11.96.1024
0.11.96.1026