summaryrefslogtreecommitdiff
path: root/cmd/podman
diff options
context:
space:
mode:
authorJhon Honce <jhonce@redhat.com>2019-06-18 09:35:48 -0700
committerJhon Honce <jhonce@redhat.com>2019-06-18 17:37:53 -0700
commitd0d9a4c9b1f525ad1132947cf883fdd66941fe62 (patch)
treea3cd7d64877f8cf1f664d73ea778af36d387393a /cmd/podman
parent1c6e4dc6bba303132a546e398a1c2de254d07f86 (diff)
downloadpodman-d0d9a4c9b1f525ad1132947cf883fdd66941fe62.tar.gz
podman-d0d9a4c9b1f525ad1132947cf883fdd66941fe62.tar.bz2
podman-d0d9a4c9b1f525ad1132947cf883fdd66941fe62.zip
Vendor in logrus v1.4.2
Fixes #3346 Signed-off-by: Jhon Honce <jhonce@redhat.com>
Diffstat (limited to 'cmd/podman')
-rw-r--r--cmd/podman/export.go4
-rw-r--r--cmd/podman/save.go4
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"