git724/forgejo
1
0
Fork 0
Code Issues Pull requests 3 Projects 1 Releases Packages Wiki Activity

minor fix on #1589

Browse source 
Signed-off-by: Unknwon <u@gogs.io>
This commit is contained in:
Unknwon 2015-09-06 18:19:30 -04:00
commit 0806725ca5
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

8
models/repo.go
View file

@ -472,8 +472,12 @@ func MigrateRepository(u *User, name, desc string, private, mirror bool, url str
// Check if repository is empty. // Check if repository is empty.
_, stderr, err = com.ExecCmdDir(repoPath, "git", "log", "-1") _, stderr, err = com.ExecCmdDir(repoPath, "git", "log", "-1")
if err != nil && strings.Contains(stderr, "fatal: bad default revision 'HEAD'") { if err != nil {
repo.IsBare = true if strings.Contains(stderr, "fatal: bad default revision 'HEAD'") {
repo.IsBare = true
} else {
return repo, fmt.Errorf("check bare: %v - %s", err, stderr)
}
} }
// Check if repository has master branch, if so set it to default branch. // Check if repository has master branch, if so set it to default branch.

7
models/user.go
View file

@ -231,28 +231,27 @@ func (u *User) UploadAvatar(data []byte) error {
if err != nil { if err != nil {
return err return err
} }
m := resize.Resize(234, 234, img, resize.NearestNeighbor) m := resize.Resize(234, 234, img, resize.NearestNeighbor)
sess := x.NewSession() sess := x.NewSession()
defer sess.Close() defer sessionRelease(sess)
if err = sess.Begin(); err != nil { if err = sess.Begin(); err != nil {
return err return err
} }
if _, err = sess.Id(u.Id).AllCols().Update(u); err != nil { if _, err = sess.Id(u.Id).AllCols().Update(u); err != nil {
sess.Rollback()
return err return err
} }
os.MkdirAll(setting.AvatarUploadPath, os.ModePerm) os.MkdirAll(setting.AvatarUploadPath, os.ModePerm)
fw, err := os.Create(u.CustomAvatarPath()) fw, err := os.Create(u.CustomAvatarPath())
if err != nil { if err != nil {
sess.Rollback()
return err return err
} }
defer fw.Close() defer fw.Close()
if err = jpeg.Encode(fw, m, nil); err != nil { if err = jpeg.Encode(fw, m, nil); err != nil {
sess.Rollback()
return err return err
} }