github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-26 20:18:52 +00:00
Code Issues Projects Releases Wiki Activity

linuxkit pkg: allow caller of git to specify what happens to stderr

Browse Source 
Currently all forward it to os.Stderr, but in my next patch I will want to
direct to /dev/null for one command.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell 2017-10-20 17:05:37 +01:00
parent e42e8ceed7
commit 0e31d8d1a9
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/cmd/linuxkit/pkglib/git.go
View File

@ -4,6 +4,7 @@ package pkglib
import ( import (
"fmt" "fmt"
"io"
"os" "os"
"os/exec" "os/exec"
"regexp" "regexp"
@ -31,9 +32,9 @@ func (g git) mkCmd(args ...string) *exec.Cmd {
return exec.Command("git", append([]string{"-C", g.dir}, args...)...) return exec.Command("git", append([]string{"-C", g.dir}, args...)...)
} }
func (g git) commandStdout(args ...string) (string, error) { func (g git) commandStdout(stderr io.Writer, args ...string) (string, error) {
cmd := g.mkCmd(args...) cmd := g.mkCmd(args...)
cmd.Stderr = os.Stderr cmd.Stderr = stderr
if debugGitCommands { if debugGitCommands {
fmt.Fprintf(os.Stderr, "+ %v\n", cmd.Args) fmt.Fprintf(os.Stderr, "+ %v\n", cmd.Args)
@ -56,7 +57,7 @@ func (g git) command(args ...string) error {
} }
func (g git) treeHash(pkg, commit string) (string, error) { func (g git) treeHash(pkg, commit string) (string, error) {
out, err := g.commandStdout("ls-tree", "--full-tree", commit, "--", pkg) out, err := g.commandStdout(os.Stderr, "ls-tree", "--full-tree", commit, "--", pkg)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -70,7 +71,7 @@ func (g git) treeHash(pkg, commit string) (string, error) {
} }
func (g git) commitHash(commit string) (string, error) { func (g git) commitHash(commit string) (string, error) {
out, err := g.commandStdout("rev-parse", commit) out, err := g.commandStdout(os.Stderr, "rev-parse", commit)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -79,7 +80,7 @@ func (g git) commitHash(commit string) (string, error) {
} }
func (g git) commitTag(commit string) (string, error) { func (g git) commitTag(commit string) (string, error) {
out, err := g.commandStdout("tag", "-l", "--points-at", commit) out, err := g.commandStdout(os.Stderr, "tag", "-l", "--points-at", commit)
if err != nil { if err != nil {
return "", err return "", err
} }