Skip to content

Commit 341b3a0

Browse files
authored
bug fix for dump when data directoryis not exist (#1025)
1 parent 2f7dc28 commit 341b3a0

File tree

1 file changed

+13
-10
lines changed

1 file changed

+13
-10
lines changed

cmd/dump.go

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ import (
1717
"code.gitea.io/gitea/models"
1818
"code.gitea.io/gitea/modules/setting"
1919
"github.com/Unknwon/cae/zip"
20+
"github.com/Unknwon/com"
2021
"github.com/urfave/cli"
2122
)
2223

@@ -114,17 +115,19 @@ func runDump(ctx *cli.Context) error {
114115
log.Printf("Custom dir %s doesn't exist, skipped", setting.CustomPath)
115116
}
116117

117-
log.Printf("Packing data directory...%s", setting.AppDataPath)
118-
var sessionAbsPath string
119-
if setting.SessionConfig.Provider == "file" {
120-
if len(setting.SessionConfig.ProviderConfig) == 0 {
121-
setting.SessionConfig.ProviderConfig = "data/sessions"
122-
}
123-
sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
124-
}
118+
if com.IsExist(setting.AppDataPath) {
119+
log.Printf("Packing data directory...%s", setting.AppDataPath)
125120

126-
if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
127-
log.Fatalf("Failed to include data directory: %v", err)
121+
var sessionAbsPath string
122+
if setting.SessionConfig.Provider == "file" {
123+
if len(setting.SessionConfig.ProviderConfig) == 0 {
124+
setting.SessionConfig.ProviderConfig = "data/sessions"
125+
}
126+
sessionAbsPath, _ = filepath.Abs(setting.SessionConfig.ProviderConfig)
127+
}
128+
if err := zipAddDirectoryExclude(z, "data", setting.AppDataPath, sessionAbsPath); err != nil {
129+
log.Fatalf("Failed to include data directory: %v", err)
130+
}
128131
}
129132

130133
if err := z.AddDir("log", setting.LogRootPath); err != nil {

0 commit comments

Comments
 (0)