diff options
| author | Miloslav Trmač <mitr@redhat.com> | 2019-10-01 22:15:58 +0200 |
|---|---|---|
| committer | Miloslav Trmač <mitr@redhat.com> | 2019-10-04 20:18:23 +0200 |
| commit | d3f59bedb393521986e645bc48c47938f321b643 (patch) | |
| tree | c61aa40e008b7fcb371d899880a4afd1714f50af /vendor/github.com/mattn/go-shellwords/util_windows.go | |
| parent | bd08fc0e9b3a9943008585879877b68789e38c31 (diff) | |
| download | podman-d3f59bedb393521986e645bc48c47938f321b643.tar.gz podman-d3f59bedb393521986e645bc48c47938f321b643.tar.bz2 podman-d3f59bedb393521986e645bc48c47938f321b643.zip | |
Update c/image to v4.0.1 and buildah to 1.11.3
This requires updating all import paths throughout, and a matching
buildah update to interoperate.
I can't figure out the reason for go.mod tracking
github.com/containers/image v3.0.2+incompatible // indirect
((go mod graph) lists it as a direct dependency of libpod, but
(go list -json -m all) lists it as an indirect dependency),
but at least looking at the vendor subdirectory, it doesn't seem
to be actually used in the built binaries.
Signed-off-by: Miloslav Trmač <mitr@redhat.com>
Diffstat (limited to 'vendor/github.com/mattn/go-shellwords/util_windows.go')
| -rw-r--r-- | vendor/github.com/mattn/go-shellwords/util_windows.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/vendor/github.com/mattn/go-shellwords/util_windows.go b/vendor/github.com/mattn/go-shellwords/util_windows.go index e46f89a1f..cda685091 100644 --- a/vendor/github.com/mattn/go-shellwords/util_windows.go +++ b/vendor/github.com/mattn/go-shellwords/util_windows.go @@ -9,9 +9,13 @@ import ( "strings" ) -func shellRun(line string) (string, error) { +func shellRun(line, dir string) (string, error) { shell := os.Getenv("COMSPEC") - b, err := exec.Command(shell, "/c", line).Output() + cmd := exec.Command(shell, "/c", line) + if dir != "" { + cmd.Dir = dir + } + b, err := cmd.Output() if err != nil { if eerr, ok := err.(*exec.ExitError); ok { b = eerr.Stderr |