mirror of
https://github.com/go-gitea/gitea.git
synced 2026-08-31 10:09:39 +09:00
fix(process): reap entire process group on cmd.Cancel (#39143)
Signed-off-by: Royce Remer <royceremer@gmail.com> Co-authored-by: wxiaoguang <wxiaoguang@gmail.com>
This commit is contained in:
co-authored by
wxiaoguang
parent
88974d2db9
commit
eea03676d3
+2
-2
@@ -27,7 +27,7 @@ type CommitSignSettings struct {
|
||||
cachedPublicKeyContent atomic.Pointer[string]
|
||||
}
|
||||
|
||||
func (css *CommitSignSettings) PublicKeyContent() (string, error) {
|
||||
func (css *CommitSignSettings) PublicKeyContent(ctx context.Context) (string, error) {
|
||||
cached := css.cachedPublicKeyContent.Load()
|
||||
if cached != nil {
|
||||
return *cached, nil
|
||||
@@ -43,7 +43,7 @@ func (css *CommitSignSettings) PublicKeyContent() (string, error) {
|
||||
return s, nil
|
||||
}
|
||||
|
||||
content, stderr, err := process.GetManager().Exec("gpg -a --export", "gpg", "-a", "--export", css.KeyID)
|
||||
content, stderr, err := process.CommandContext(ctx, "gpg", "-a", "--export", css.KeyID).OutputString()
|
||||
if err != nil {
|
||||
return "", fmt.Errorf("unable to get default signing key: %s, %s, %w", css.KeyID, stderr, err)
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user