From d305448fa802a91ba81af1b78294f1658bcf834c Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 11 Apr 2014 23:52:08 -0400 Subject: Mirror bug fix --- routers/install.go | 4 ++-- routers/repo/commit.go | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'routers') diff --git a/routers/install.go b/routers/install.go index 78ba383dee..76c03f0529 100644 --- a/routers/install.go +++ b/routers/install.go @@ -146,9 +146,9 @@ func InstallPost(ctx *middleware.Context, form auth.InstallForm) { } // Check run user. - curUser := os.Getenv("USERNAME") + curUser := os.Getenv("USER") if len(curUser) == 0 { - curUser = os.Getenv("USER") + curUser = os.Getenv("USERNAME") } // Does not check run user when the install lock is off. if form.RunUser != curUser { diff --git a/routers/repo/commit.go b/routers/repo/commit.go index 5a7bb589f7..fed1a6badd 100644 --- a/routers/repo/commit.go +++ b/routers/repo/commit.go @@ -52,6 +52,10 @@ func Commits(ctx *middleware.Context, params martini.Params) { //both `git log branchName` and `git log commitId` work commits, err := models.GetCommitsByRange(repoPath, branchName, page) + if err != nil { + ctx.Handle(500, "repo.Commits(get commits)", err) + return + } ctx.Data["Username"] = userName ctx.Data["Reponame"] = repoName -- cgit v1.2.3