diff options
author | Daniel J Walsh <dwalsh@redhat.com> | 2019-04-05 11:02:41 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-04-05 11:02:41 -0400 |
commit | bc320be00bc584bd88525266d23a9d5edb9d44f8 (patch) | |
tree | c6d03492ac9684f22cdf5e553321569369f1cf59 /cmd/podman/utils.go | |
parent | ed8bd80d3f09fb5c82c53bde8d6779db2613f158 (diff) | |
parent | 023eba20db1912a477eedff529fa52d356033a38 (diff) | |
download | podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.tar.gz podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.tar.bz2 podman-bc320be00bc584bd88525266d23a9d5edb9d44f8.zip |
Merge pull request #2742 from openSUSE/golangci-lint
Switch to golangci-lint
Diffstat (limited to 'cmd/podman/utils.go')
-rw-r--r-- | cmd/podman/utils.go | 42 |
1 files changed, 0 insertions, 42 deletions
diff --git a/cmd/podman/utils.go b/cmd/podman/utils.go index 45d081512..2327a943a 100644 --- a/cmd/podman/utils.go +++ b/cmd/podman/utils.go @@ -7,7 +7,6 @@ import ( "os" gosignal "os/signal" - "github.com/containers/libpod/cmd/podman/cliconfig" "github.com/containers/libpod/libpod" "github.com/docker/docker/pkg/signal" "github.com/docker/docker/pkg/term" @@ -159,47 +158,6 @@ func (f *RawTtyFormatter) Format(entry *logrus.Entry) ([]byte, error) { return bytes, err } -// For pod commands that have a latest and all flag, getPodsFromContext gets -// pods the user specifies. If there's an error before getting pods, the pods slice -// will be empty and error will be not nil. If an error occured after, the pod slice -// will hold all of the successful pods, and error will hold the last error. -// The remaining errors will be logged. On success, pods will hold all pods and -// error will be nil. -func getPodsFromContext(c *cliconfig.PodmanCommand, r *libpod.Runtime) ([]*libpod.Pod, error) { - args := c.InputArgs - var pods []*libpod.Pod - var lastError error - var err error - - if c.Bool("all") { - pods, err = r.GetAllPods() - if err != nil { - return nil, errors.Wrapf(err, "unable to get running pods") - } - } - - if c.Bool("latest") { - pod, err := r.GetLatestPod() - if err != nil { - return nil, errors.Wrapf(err, "unable to get latest pod") - } - pods = append(pods, pod) - } - - for _, i := range args { - pod, err := r.LookupPod(i) - if err != nil { - if lastError != nil { - logrus.Errorf("%q", lastError) - } - lastError = errors.Wrapf(err, "unable to find pod %s", i) - continue - } - pods = append(pods, pod) - } - return pods, lastError -} - //printParallelOutput takes the map of parallel worker results and outputs them // to stdout func printParallelOutput(m map[string]error, errCount int) error { |