diff options
| author | 6543 <6543@obermui.de> | 2020-12-25 09:59:32 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-25 11:59:32 +0200 |
| commit | a19447aed128ecadfcd938d6a80cd4951af1f4ce (patch) | |
| tree | 6312bf946d601aab29731645a4777feeaea66036 /modules/ssh | |
| parent | 04ae0f2f3f4556c6d0b4adc5f2cffd0cc7d25151 (diff) | |
| download | gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.tar.gz gitea-a19447aed128ecadfcd938d6a80cd4951af1f4ce.zip | |
migrate from com.* to alternatives (#14103)
* remove github.com/unknwon/com from models
* dont use "com.ToStr()"
* replace "com.ToStr" with "fmt.Sprint" where its easy to do
* more refactor
* fix test
* just "proxy" Copy func for now
* as per @lunny
Diffstat (limited to 'modules/ssh')
| -rw-r--r-- | modules/ssh/ssh.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/ssh/ssh.go b/modules/ssh/ssh.go index 4ba52d5653..2b7fd593b5 100644 --- a/modules/ssh/ssh.go +++ b/modules/ssh/ssh.go @@ -25,7 +25,6 @@ import ( "code.gitea.io/gitea/modules/util" "github.com/gliderlabs/ssh" - "github.com/unknwon/com" gossh "golang.org/x/crypto/ssh" ) @@ -58,13 +57,13 @@ func getExitStatusFromError(err error) int { } func sessionHandler(session ssh.Session) { - keyID := session.Context().Value(giteaKeyID).(int64) + keyID := fmt.Sprintf("%d", session.Context().Value(giteaKeyID).(int64)) command := session.RawCommand() log.Trace("SSH: Payload: %v", command) - args := []string{"serv", "key-" + com.ToStr(keyID), "--config=" + setting.CustomConf} + args := []string{"serv", "key-" + keyID, "--config=" + setting.CustomConf} log.Trace("SSH: Arguments: %v", args) cmd := exec.Command(setting.AppPath, args...) cmd.Env = append( |