Merge branch 'master' of github.com:gogits/gogs into dev

This commit is contained in:
Unknown 2014-06-29 16:32:28 -04:00
commit 269da8fe7a
2 changed files with 2 additions and 13 deletions

View file

@ -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)