Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e212bcdc authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "If invoked 'go list' command fails, show its stderr."

parents 77b99b09 d5fc469d
Loading
Loading
Loading
Loading
+7 −4
Original line number Diff line number Diff line
@@ -335,12 +335,15 @@ Usage: %s [--rewrite <pkg-prefix>=<replace>] [-exclude <package>] [-regen <file>
	}

	cmd := exec.Command("go", "list", "-json", "./...")
	output, err := cmd.Output()
	if err != nil {
		fmt.Fprintf(os.Stderr, "Failed to dump the go packages: %v\n", err)
	var stdoutb, stderrb bytes.Buffer
	cmd.Stdout = &stdoutb
	cmd.Stderr = &stderrb
	if err := cmd.Run(); err != nil {
		fmt.Fprintf(os.Stderr, "Running %q to dump the Go packages failed: %v, stderr:\n%s\n",
			cmd.String(), err, stderrb.Bytes())
		os.Exit(1)
	}
	decoder := json.NewDecoder(bytes.NewReader(output))
	decoder := json.NewDecoder(bytes.NewReader(stdoutb.Bytes()))

	pkgs := []*GoPackage{}
	pkgMap := map[string]*GoPackage{}