diff options
Diffstat (limited to 'models')
| -rw-r--r-- | models/models.go | 3 | ||||
| -rw-r--r-- | models/user.go | 15 |
2 files changed, 9 insertions, 9 deletions
diff --git a/models/models.go b/models/models.go index d07b1fe3..0dee6547 100644 --- a/models/models.go +++ b/models/models.go @@ -83,6 +83,9 @@ func setEngine() { //log.Trace("Initialized database -> %s", dbName) RepoRootPath = utils.Cfg.MustValue("repository", "ROOT") + if uname.Username == "jiahuachen" { + RepoRootPath = utils.Cfg.MustValue("repository", "ROOT_jiahuachen") + } } func init() { diff --git a/models/user.go b/models/user.go index 82059738..d8469251 100644 --- a/models/user.go +++ b/models/user.go @@ -15,7 +15,6 @@ import ( "github.com/dchest/scrypt" "github.com/gogits/gogs/utils" - "github.com/gogits/gogs/utils/log" ) // User types. @@ -100,17 +99,15 @@ func RegisterUser(user *User) (err error) { user.LowerName = strings.ToLower(user.Name) user.Avatar = utils.EncodeMd5(user.Email) user.EncodePasswd() - _, err = orm.Insert(user) - if err != nil { + if _, err = orm.Insert(user); err != nil { return err } - err = os.MkdirAll(UserPath(user.Name), os.ModePerm) - if err != nil { - _, err2 := orm.Id(user.Id).Delete(&User{}) - if err2 != nil { - log.Error("create userpath %s failed and delete table record faild", - user.Name) + if err = os.MkdirAll(UserPath(user.Name), os.ModePerm); err != nil { + + if _, err := orm.Id(user.Id).Delete(&User{}); err != nil { + return errors.New(fmt.Sprintf( + "both create userpath %s and delete table record faild", user.Name)) } return err } |