mirror
/
go
mirror of https://github.com/golang/go.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

misc/ios: ignore stderr from iOS tools 

On (at least) macOS 10.12, the `security cms` subcommand used by the
iOS detection script will output an error to stderr. The command
otherwise succeeds, but the extra line confuses a later parsing step.

To fix it, use only stdout and ignore stderr from every command run
by detect.go.

For the new iOS builders.

Change-Id: Iee426da7926d7f987ba1be061fa92ebb853ef53d
Reviewed-on: https://go-review.googlesource.com/36059
Reviewed-by: David Crawshaw <crawshaw@golang.org>
Run-TryBot: Elias Naur <elias.naur@gmail.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Elias Naur 2017-02-01 08:57:46 +01:00
parent 3f45916433
commit ade6bcf1d5
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
misc/ios/detect.go
View File

@ -33,7 +33,7 @@ func main() {
fname := f.Name() fname := f.Name()
defer os.Remove(fname) defer os.Remove(fname)
out := combinedOutput(parseMobileProvision(mp)) out := output(parseMobileProvision(mp))
_, err = f.Write(out) _, err = f.Write(out)
check(err) check(err)
check(f.Close()) check(f.Close())
@ -111,12 +111,12 @@ func plistExtract(fname string, path string) ([]byte, error) {
} }
func getLines(cmd *exec.Cmd) [][]byte { func getLines(cmd *exec.Cmd) [][]byte {
out := combinedOutput(cmd) out := output(cmd)
return bytes.Split(out, []byte("\n")) return bytes.Split(out, []byte("\n"))
} }
func combinedOutput(cmd *exec.Cmd) []byte { func output(cmd *exec.Cmd) []byte {
out, err := cmd.CombinedOutput() out, err := cmd.Output()
if err != nil { if err != nil {
fmt.Println(strings.Join(cmd.Args, "\n")) fmt.Println(strings.Join(cmd.Args, "\n"))
fmt.Fprintln(os.Stderr, err) fmt.Fprintln(os.Stderr, err)