summaryrefslogtreecommitdiffstats
path: root/cmd/serve.go
diff options
context:
space:
mode:
authorUnknown <joe2010xtmf@163.com>2014-06-29 16:32:28 -0400
committerUnknown <joe2010xtmf@163.com>2014-06-29 16:32:28 -0400
commit269da8fe7ac057d27586dd21b87d3164a8725790 (patch)
treea497f1991ed6bb484da6e89886d930b271239a9d /cmd/serve.go
parente4ea5cf5984652e3966825bc2b68dd1abc3eef1c (diff)
parentbe123588ced4662048d6c3bd10cac67aac46129b (diff)
downloadgitea-269da8fe7ac057d27586dd21b87d3164a8725790.tar.gz
gitea-269da8fe7ac057d27586dd21b87d3164a8725790.zip
Merge branch 'master' of github.com:gogits/gogs into dev
Diffstat (limited to 'cmd/serve.go')
-rw-r--r--cmd/serve.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/serve.go b/cmd/serve.go
index 7644b0cf2b..bb1b4927b4 100644
--- a/cmd/serve.go
+++ b/cmd/serve.go
@@ -9,6 +9,7 @@ import (
"os"
"os/exec"
"path"
+ "path/filepath"
"strconv"
"strings"
@@ -30,7 +31,7 @@ var CmdServ = cli.Command{
func setup(logPath string) {
setting.NewConfigContext()
- log.NewGitLogger(path.Join(setting.LogRootPath, logPath))
+ log.NewGitLogger(filepath.Join(setting.LogRootPath, logPath))
models.LoadModelsConfig()
if models.UseSQLite3 {
@@ -166,7 +167,6 @@ func runServ(k *cli.Context) {
return
}
- //models.SetRepoEnvs(user.Id, user.Name, repoName, repoUserName)
uuid := uuid.NewV4().String()
os.Setenv("uuid", uuid)