bug fix for dump when data directoryis not exist (go-gitea#1025)

gfxlabs · Mar 2, 2017 · 341b3a0 · 341b3a0
1 parent 2f7dc28
commit 341b3a0
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/cmd/dump.go b/cmd/dump.go
@@ -17,6 +17,7 @@ import (
 	"code.gitea.io/gitea/models"
 	"code.gitea.io/gitea/modules/setting"
 	"github.com/Unknwon/cae/zip"
+	"github.com/Unknwon/com"
 	"github.com/urfave/cli"
 )
 
@@ -114,17 +115,19 @@ func runDump(ctx *cli.Context) error {
 		log.Printf("Custom dir %s doesn't exist, skipped", setting.CustomPath)
 	}
 
-	log.Printf("Packing data directory...%s", setting.AppDataPath)
-	var sessionAbsPath string
-	if setting.SessionConfig.Provider == "file" {
-		if len(setting.SessionConfig.ProviderConfig) == 0 {
-			setting.SessionConfig.ProviderConfig = "data/sessions"
-		}
-		sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
-	}
+	if com.IsExist(setting.AppDataPath) {
+		log.Printf("Packing data directory...%s", setting.AppDataPath)
 
-	if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
-		log.Fatalf("Failed to include data directory: %v", err)
+		var sessionAbsPath string
+		if setting.SessionConfig.Provider == "file" {
+			if len(setting.SessionConfig.ProviderConfig) == 0 {
+				setting.SessionConfig.ProviderConfig = "data/sessions"
+			}
+			sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
+		}
+		if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
+			log.Fatalf("Failed to include data directory: %v", err)
+		}
 	}
 
 	if err := z.AddDir("log", setting.LogRootPath); err != nil {