From 563fc7c6d7d685678f86ba13e565bafa96f005e0 Mon Sep 17 00:00:00 2001 From: Unknwon Date: Fri, 10 Feb 2017 11:58:04 -0500 Subject: [PATCH] dump: check existence before include data subdirs (#4100) --- cmd/dump.go | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/cmd/dump.go b/cmd/dump.go index 5bc3c6390..2a243e417 100644 --- a/cmd/dump.go +++ b/cmd/dump.go @@ -14,6 +14,7 @@ import ( "io/ioutil" "github.com/Unknwon/cae/zip" + "github.com/Unknwon/com" "github.com/urfave/cli" "github.com/gogits/gogs/models" @@ -93,8 +94,13 @@ func runDump(ctx *cli.Context) error { } for _, dir := range []string{"attachments", "avatars"} { - if err := z.AddDir(path.Join("data", dir), path.Join(setting.AppDataPath, dir)); err != nil { - log.Fatalf("Fail to include data/%s: %v", dir, err) + dirPath := path.Join(setting.AppDataPath, dir) + if !com.IsDir(dirPath) { + continue + } + + if err := z.AddDir(path.Join("data", dir), dirPath); err != nil { + log.Fatalf("Fail to include '%s': %v", dirPath, err) } }