diff options
| -rw-r--r-- | models/ssh_key.go | 5 | ||||
| -rw-r--r-- | routers/repo/setting.go | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/models/ssh_key.go b/models/ssh_key.go index 3c970848..231ae1e1 100644 --- a/models/ssh_key.go +++ b/models/ssh_key.go @@ -385,9 +385,10 @@ func addKey(e Engine, key *PublicKey) (err error) { if err = ioutil.WriteFile(tmpPath, []byte(key.Content), 0644); err != nil { return err } - stdout, stderr, err := process.Exec("AddPublicKey", "ssh-keygen", "-lf", tmpPath) + + stdout, stderr, err := process.Exec("AddPublicKey", setting.SSH.KeygenPath, "-lf", tmpPath) if err != nil { - return fmt.Errorf("'ssh-keygen -lf %s' failed with error '%s': %s", tmpPath, err, stderr) + return fmt.Errorf("fail to parse public key: %s - %s", err, stderr) } else if len(stdout) < 2 { return errors.New("not enough output for calculating fingerprint: " + stdout) } diff --git a/routers/repo/setting.go b/routers/repo/setting.go index bcb6dc89..8b8a25d5 100644 --- a/routers/repo/setting.go +++ b/routers/repo/setting.go @@ -378,7 +378,7 @@ func parseOwnerAndRepo(ctx *context.Context) (*models.User, *models.Repository) owner, err := models.GetUserByName(ctx.Params(":username")) if err != nil { if models.IsErrUserNotExist(err) { - ctx.Handle(404, "GetUserByName", err) + ctx.Handle(404, "GetUserByName", nil) } else { ctx.Handle(500, "GetUserByName", err) } @@ -388,7 +388,7 @@ func parseOwnerAndRepo(ctx *context.Context) (*models.User, *models.Repository) repo, err := models.GetRepositoryByName(owner.ID, ctx.Params(":reponame")) if err != nil { if models.IsErrRepoNotExist(err) { - ctx.Handle(404, "GetRepositoryByName", err) + ctx.Handle(404, "GetRepositoryByName", nil) } else { ctx.Handle(500, "GetRepositoryByName", err) } |