Skip to content

Commit 5aaecb9

Browse files
committed
This seems to be breaking Gradle :(
Revert "fix: create process group" This reverts commit 0f3b2f3. Revert "chore: fix linting" This reverts commit 1555512. Revert "fix: workaround for golang/go#52226" This reverts commit 0cd74ef.
1 parent 3c579c6 commit 5aaecb9

File tree

3 files changed

+2
-38
lines changed

3 files changed

+2
-38
lines changed

app/exec_cmd.go

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ package app
33
import (
44
"net/http"
55
"os"
6-
"os/exec"
76
"path/filepath"
87
"strings"
98
"syscall"
@@ -58,22 +57,7 @@ func (e *execCmd) Run(l *ui.UI, cache *cache.Cache, sta *state.State, env *hermi
5857
if filepath.Base(e.Binary) == "hermit" {
5958
env := os.Environ()
6059
env = append(env, "HERMIT_ENV="+envDir)
61-
cmd := &exec.Cmd{
62-
Path: self,
63-
Args: args,
64-
Env: env,
65-
Stdout: os.Stdout,
66-
Stderr: os.Stderr,
67-
Stdin: os.Stdin,
68-
SysProcAttr: &syscall.SysProcAttr{Setpgid: true},
69-
}
70-
err = cmd.Run()
71-
var exitErr *exec.ExitError
72-
if errors.As(err, &exitErr) {
73-
os.Exit(exitErr.ExitCode())
74-
}
75-
// return syscall.Exec(self, args, env)
76-
return errors.Wrapf(err, "failed to execute %q", e.Binary)
60+
return syscall.Exec(self, args, env)
7761
}
7862

7963
pkg, binary, err := env.ResolveLink(l, e.Binary)

env.go

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import (
1111
"io/ioutil"
1212
"net/http"
1313
"os"
14-
"os/exec"
1514
"path/filepath"
1615
"runtime"
1716
"sort"
@@ -758,21 +757,7 @@ func (e *Env) Exec(l *ui.UI, pkg *manifest.Package, binary string, args []string
758757
l.Clear()
759758
timer()
760759

761-
cmd := &exec.Cmd{
762-
Path: bin,
763-
Args: argsCopy,
764-
Env: env,
765-
Stdout: os.Stdout,
766-
Stderr: os.Stderr,
767-
Stdin: os.Stdin,
768-
SysProcAttr: &syscall.SysProcAttr{Setpgid: true},
769-
}
770-
err = cmd.Run()
771-
var exitErr *exec.ExitError
772-
if errors.As(err, &exitErr) {
773-
os.Exit(exitErr.ExitCode())
774-
}
775-
// err = syscall.Exec(bin, argsCopy, env)
760+
err = syscall.Exec(bin, argsCopy, env)
776761
return errors.Wrapf(err, "%s: failed to execute %q", pkg, bin)
777762
}
778763
return errors.Errorf("%s: could not find binary %q", pkg, binary)

errors/errors.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@ func Is(err, target error) bool {
105105
return errors.Is(err, target)
106106
}
107107

108-
// As mirrors the stdlib errors.As function.
109-
func As(err error, target interface{}) bool {
110-
return errors.As(err, target)
111-
}
112-
113108
// Unwrap aliases the stdlib errors.Unwrap function.
114109
func Unwrap(err error) error {
115110
return errors.Unwrap(err)

0 commit comments

Comments
 (0)