diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-19 17:36:55 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-19 17:36:55 +0200 |
| commit | c211b3ff6a71413dbeba90f8ec8f13fec9622291 (patch) | |
| tree | ae2ed64fa16c19baaaf682e8c09334971b3de341 /cmd | |
| parent | 7be87f5551ca36d30518dcd62d623c4d45bb830b (diff) | |
| parent | d0d9a4c9b1f525ad1132947cf883fdd66941fe62 (diff) | |
| download | podman-c211b3ff6a71413dbeba90f8ec8f13fec9622291.tar.gz podman-c211b3ff6a71413dbeba90f8ec8f13fec9622291.tar.bz2 podman-c211b3ff6a71413dbeba90f8ec8f13fec9622291.zip | |
Merge pull request #3364 from jwhonce/wip/logrus
Vendor in logrus v1.4.2
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/podman/export.go | 4 | ||||
| -rw-r--r-- | cmd/podman/save.go | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmd/podman/export.go b/cmd/podman/export.go index 82a4c13e7..f2336167b 100644 --- a/cmd/podman/export.go +++ b/cmd/podman/export.go @@ -7,8 +7,8 @@ import ( "github.com/containers/libpod/cmd/podman/shared/parse" "github.com/containers/libpod/pkg/adapter" "github.com/pkg/errors" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "golang.org/x/crypto/ssh/terminal" ) var ( @@ -62,7 +62,7 @@ func exportCmd(c *cliconfig.ExportValues) error { if len(output) == 0 { file := os.Stdout - if logrus.IsTerminal(file) { + if terminal.IsTerminal(int(file.Fd())) { return errors.Errorf("refusing to export to terminal. Use -o flag or redirect") } output = "/dev/stdout" diff --git a/cmd/podman/save.go b/cmd/podman/save.go index 4d204337e..e59c9df5f 100644 --- a/cmd/podman/save.go +++ b/cmd/podman/save.go @@ -9,8 +9,8 @@ import ( "github.com/containers/libpod/pkg/adapter" "github.com/containers/libpod/pkg/util" "github.com/pkg/errors" - "github.com/sirupsen/logrus" "github.com/spf13/cobra" + "golang.org/x/crypto/ssh/terminal" ) const ( @@ -82,7 +82,7 @@ func saveCmd(c *cliconfig.SaveValues) error { if len(c.Output) == 0 { fi := os.Stdout - if logrus.IsTerminal(fi) { + if terminal.IsTerminal(int(fi.Fd())) { return errors.Errorf("refusing to save to terminal. Use -o flag or redirect") } c.Output = "/dev/stdout" |