]> source.dussan.org Git - gitea.git/commitdiff
merge
authorLunny Xiao <xiaolunwen@gmail.com>
Sun, 23 Mar 2014 08:43:31 +0000 (16:43 +0800)
committerLunny Xiao <xiaolunwen@gmail.com>
Sun, 23 Mar 2014 08:43:31 +0000 (16:43 +0800)
1  2 
models/models.go
serve.go

Simple merge
diff --cc serve.go
index b786c54356d15df839708b187b8b1b77bac803a9,be8dedc98557182fc8a457b14ef5dd64a8bdbab5..54296049d5d97f70242ccf615ce420ed5a7ebf3f
+++ b/serve.go
@@@ -104,20 -84,15 +104,20 @@@ func runServ(k *cli.Context) 
                repoName = repoName[:len(repoName)-4]
        }
  
 -      os.Setenv("userName", user.Name)
 -      os.Setenv("userId", strconv.Itoa(int(user.Id)))
 +      //os.Setenv("userName", user.Name)
 +      //os.Setenv("userId", strconv.Itoa(int(user.Id)))
-       repo, err := models.GetRepositoryByName(user, repoName)
+       repo, err := models.GetRepositoryByName(user.Id, repoName)
 +      var isExist bool = true
        if err != nil {
 -              println("Unavilable repository", err)
 -              return
 +              if err == models.ErrRepoNotExist {
 +                      isExist = false
 +              } else {
 +                      println("Unavilable repository", err)
 +                      return
 +              }
        }
 -      os.Setenv("repoId", strconv.Itoa(int(repo.Id)))
 -      os.Setenv("repoName", repoName)
 +      //os.Setenv("repoId", strconv.Itoa(int(repo.Id)))
 +      //os.Setenv("repoName", repoName)
  
        isWrite := In(verb, COMMANDS_WRITE)
        isRead := In(verb, COMMANDS_READONLY)