Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Multiple Gitea Doctor improvements (#10943) (#10990) (#10064) (#9095) #10991

Merged
merged 2 commits into from
Apr 6, 2020
Merged

Multiple Gitea Doctor improvements (#10943) (#10990) (#10064) (#9095) #10991

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff72a38
Mulitple Gitea Doctor improvements (#10943)
zeripath Apr 6, 2020
6c644a2
Switch to io.Writer instead of io.StringWriter
zeripath Apr 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Switch to io.Writer instead of io.StringWriter 
Signed-off-by: Andrew Thornton <art27@cantab.net>
  • Loading branch information
@zeripath
zeripath committed Apr 6, 2020
commit 6c644a2366d07d1bb50b3bc442a7e712d61b13d2
8 changes: 4 additions & 4 deletions models/ssh_key.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -697,13 +697,13 @@ func rewriteAllPublicKeys(e Engine) error {
}

// RegeneratePublicKeys regenerates the authorized_keys file
func RegeneratePublicKeys(t io.StringWriter) error {
func RegeneratePublicKeys(t io.Writer) error {
return regeneratePublicKeys(x, t)
}

func regeneratePublicKeys(e Engine, t io.StringWriter) error {
func regeneratePublicKeys(e Engine, t io.Writer) error {
err := e.Iterate(new(PublicKey), func(idx int, bean interface{}) (err error) {
_, err = t.WriteString((bean.(*PublicKey)).AuthorizedString())
_, err = t.Write([]byte((bean.(*PublicKey)).AuthorizedString()))
return err
})
if err != nil {
Expand All @@ -723,7 +723,7 @@ func regeneratePublicKeys(e Engine, t io.StringWriter) error {
scanner.Scan()
continue
}
_, err = t.WriteString(line + "\n")
_, err = t.Write([]byte(line + "\n"))
if err != nil {
f.Close()
return err
Expand Down