aboutsummaryrefslogtreecommitdiff
path: root/cmd
diff options
context:
space:
mode:
authorDaniel J Walsh <dwalsh@redhat.com>2017-11-02 09:33:06 -0400
committerDaniel J Walsh <dwalsh@redhat.com>2017-11-02 15:30:39 -0400
commit92818fdfb79a142566abb2876c67b23b8944b836 (patch)
tree6ee2383360c0d09b0b90df5fb39a1300e89e3d1a /cmd
parent83b55c47717787766a5bd162840d494798f38952 (diff)
downloadpodman-92818fdfb79a142566abb2876c67b23b8944b836.tar.gz
podman-92818fdfb79a142566abb2876c67b23b8944b836.tar.bz2
podman-92818fdfb79a142566abb2876c67b23b8944b836.zip
Fix gofmt errors
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
Diffstat (limited to 'cmd')
-rw-r--r--cmd/kpod/common.go2
-rw-r--r--cmd/kpod/create.go2
-rw-r--r--cmd/kpod/diff.go2
-rw-r--r--cmd/kpod/history.go2
-rw-r--r--cmd/kpod/images.go4
-rw-r--r--cmd/kpod/info.go2
-rw-r--r--cmd/kpod/inspect.go2
-rw-r--r--cmd/kpod/kill.go2
-rw-r--r--cmd/kpod/load.go2
-rw-r--r--cmd/kpod/login.go2
-rw-r--r--cmd/kpod/logout.go2
-rw-r--r--cmd/kpod/logs.go2
-rw-r--r--cmd/kpod/mount.go2
-rw-r--r--cmd/kpod/pause.go2
-rw-r--r--cmd/kpod/ps.go2
-rw-r--r--cmd/kpod/pull.go2
-rw-r--r--cmd/kpod/push.go2
-rw-r--r--cmd/kpod/rename.go2
-rw-r--r--cmd/kpod/rm.go2
-rw-r--r--cmd/kpod/run.go2
-rw-r--r--cmd/kpod/save.go2
-rw-r--r--cmd/kpod/spec.go4
-rw-r--r--cmd/kpod/stats.go2
-rw-r--r--cmd/kpod/stop.go2
-rw-r--r--cmd/kpod/tag.go2
-rw-r--r--cmd/kpod/unpause.go2
-rw-r--r--cmd/kpod/wait.go2
27 files changed, 29 insertions, 29 deletions
diff --git a/cmd/kpod/common.go b/cmd/kpod/common.go
index 8bd63b338..d924f17a3 100644
--- a/cmd/kpod/common.go
+++ b/cmd/kpod/common.go
@@ -9,9 +9,9 @@ import (
is "github.com/containers/image/storage"
"github.com/containers/storage"
"github.com/fatih/camelcase"
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/libkpod"
"github.com/projectatomic/libpod/libpod"
- "github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/create.go b/cmd/kpod/create.go
index 2e79c883e..ddfe9e5ed 100644
--- a/cmd/kpod/create.go
+++ b/cmd/kpod/create.go
@@ -5,8 +5,8 @@ import (
"strconv"
"github.com/docker/go-units"
- "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod"
"github.com/urfave/cli"
pb "k8s.io/kubernetes/pkg/kubelet/apis/cri/v1alpha1/runtime"
)
diff --git a/cmd/kpod/diff.go b/cmd/kpod/diff.go
index fc2dc8ef8..3a3b82e15 100644
--- a/cmd/kpod/diff.go
+++ b/cmd/kpod/diff.go
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/containers/storage/pkg/archive"
- "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/history.go b/cmd/kpod/history.go
index ea91904ad..ab2115aed 100644
--- a/cmd/kpod/history.go
+++ b/cmd/kpod/history.go
@@ -8,9 +8,9 @@ import (
"github.com/containers/image/types"
units "github.com/docker/go-units"
- "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/images.go b/cmd/kpod/images.go
index 36727a897..0eac22864 100644
--- a/cmd/kpod/images.go
+++ b/cmd/kpod/images.go
@@ -9,11 +9,11 @@ import (
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/docker/go-units"
+ digest "github.com/opencontainers/go-digest"
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/projectatomic/libpod/libpod"
"github.com/projectatomic/libpod/libpod/common"
- digest "github.com/opencontainers/go-digest"
- "github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/info.go b/cmd/kpod/info.go
index 3c634ac9c..0b8ae75b4 100644
--- a/cmd/kpod/info.go
+++ b/cmd/kpod/info.go
@@ -8,8 +8,8 @@ import (
"runtime"
"github.com/docker/docker/pkg/system"
- "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/inspect.go b/cmd/kpod/inspect.go
index 78439ed89..a70e285ac 100644
--- a/cmd/kpod/inspect.go
+++ b/cmd/kpod/inspect.go
@@ -1,10 +1,10 @@
package main
import (
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/projectatomic/libpod/libkpod"
"github.com/projectatomic/libpod/libpod/images"
- "github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/kill.go b/cmd/kpod/kill.go
index 686305781..9fab7cc88 100644
--- a/cmd/kpod/kill.go
+++ b/cmd/kpod/kill.go
@@ -5,8 +5,8 @@ import (
"os"
"github.com/docker/docker/pkg/signal"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/load.go b/cmd/kpod/load.go
index 392ce08ac..31975fc76 100644
--- a/cmd/kpod/load.go
+++ b/cmd/kpod/load.go
@@ -5,8 +5,8 @@ import (
"io/ioutil"
"os"
- "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/login.go b/cmd/kpod/login.go
index 956de6d14..df74a2fdf 100644
--- a/cmd/kpod/login.go
+++ b/cmd/kpod/login.go
@@ -9,8 +9,8 @@ import (
"github.com/containers/image/docker"
"github.com/containers/image/pkg/docker/config"
- "github.com/projectatomic/libpod/libpod/common"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod/common"
"github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal"
)
diff --git a/cmd/kpod/logout.go b/cmd/kpod/logout.go
index 0b07f1a63..9d1d52e32 100644
--- a/cmd/kpod/logout.go
+++ b/cmd/kpod/logout.go
@@ -4,8 +4,8 @@ import (
"fmt"
"github.com/containers/image/pkg/docker/config"
- "github.com/projectatomic/libpod/libpod/common"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod/common"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/logs.go b/cmd/kpod/logs.go
index 23c78688d..1d0cea996 100644
--- a/cmd/kpod/logs.go
+++ b/cmd/kpod/logs.go
@@ -4,8 +4,8 @@ import (
"fmt"
"time"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/mount.go b/cmd/kpod/mount.go
index 4a68621ac..d9df7ffa5 100644
--- a/cmd/kpod/mount.go
+++ b/cmd/kpod/mount.go
@@ -4,8 +4,8 @@ import (
js "encoding/json"
"fmt"
- of "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/pkg/errors"
+ of "github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/pause.go b/cmd/kpod/pause.go
index 510aba424..094013e6d 100644
--- a/cmd/kpod/pause.go
+++ b/cmd/kpod/pause.go
@@ -2,8 +2,8 @@ package main
import (
"fmt"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
"os"
)
diff --git a/cmd/kpod/ps.go b/cmd/kpod/ps.go
index 2e981bfaa..a5f64ed11 100644
--- a/cmd/kpod/ps.go
+++ b/cmd/kpod/ps.go
@@ -15,10 +15,10 @@ import (
"k8s.io/apimachinery/pkg/fields"
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/cmd/kpod/formats"
"github.com/projectatomic/libpod/libkpod"
"github.com/projectatomic/libpod/oci"
- "github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/pull.go b/cmd/kpod/pull.go
index 662bb2faa..399e8c1b4 100644
--- a/cmd/kpod/pull.go
+++ b/cmd/kpod/pull.go
@@ -8,9 +8,9 @@ import (
"golang.org/x/crypto/ssh/terminal"
"github.com/containers/image/types"
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/libpod"
"github.com/projectatomic/libpod/libpod/common"
- "github.com/pkg/errors"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/push.go b/cmd/kpod/push.go
index 518c1d8dc..4f1218a08 100644
--- a/cmd/kpod/push.go
+++ b/cmd/kpod/push.go
@@ -7,9 +7,9 @@ import (
"github.com/containers/image/types"
"github.com/containers/storage/pkg/archive"
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/libpod"
"github.com/projectatomic/libpod/libpod/common"
- "github.com/pkg/errors"
"github.com/urfave/cli"
"golang.org/x/crypto/ssh/terminal"
)
diff --git a/cmd/kpod/rename.go b/cmd/kpod/rename.go
index 68b9a6108..749dd756d 100644
--- a/cmd/kpod/rename.go
+++ b/cmd/kpod/rename.go
@@ -1,8 +1,8 @@
package main
import (
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/rm.go b/cmd/kpod/rm.go
index 8f51befc9..0d3027abd 100644
--- a/cmd/kpod/rm.go
+++ b/cmd/kpod/rm.go
@@ -3,8 +3,8 @@ package main
import (
"fmt"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
"golang.org/x/net/context"
)
diff --git a/cmd/kpod/run.go b/cmd/kpod/run.go
index bf9375d95..f1563edc3 100644
--- a/cmd/kpod/run.go
+++ b/cmd/kpod/run.go
@@ -3,8 +3,8 @@ package main
import (
"fmt"
- "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/save.go b/cmd/kpod/save.go
index 55998fe4d..287821f0a 100644
--- a/cmd/kpod/save.go
+++ b/cmd/kpod/save.go
@@ -4,8 +4,8 @@ import (
"io"
"os"
- "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/spec.go b/cmd/kpod/spec.go
index 4b05005bd..facacba8b 100644
--- a/cmd/kpod/spec.go
+++ b/cmd/kpod/spec.go
@@ -4,10 +4,10 @@ import (
"fmt"
"strings"
- "github.com/projectatomic/libpod/libpod"
- ann "github.com/projectatomic/libpod/pkg/annotations"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod"
+ ann "github.com/projectatomic/libpod/pkg/annotations"
"github.com/sirupsen/logrus"
"github.com/urfave/cli"
"golang.org/x/sys/unix"
diff --git a/cmd/kpod/stats.go b/cmd/kpod/stats.go
index 8548354a9..37cd9090b 100644
--- a/cmd/kpod/stats.go
+++ b/cmd/kpod/stats.go
@@ -11,9 +11,9 @@ import (
"github.com/docker/go-units"
tm "github.com/buger/goterm"
+ "github.com/pkg/errors"
"github.com/projectatomic/libpod/libkpod"
"github.com/projectatomic/libpod/oci"
- "github.com/pkg/errors"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/stop.go b/cmd/kpod/stop.go
index 68e4be472..79325da5f 100644
--- a/cmd/kpod/stop.go
+++ b/cmd/kpod/stop.go
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
"golang.org/x/net/context"
)
diff --git a/cmd/kpod/tag.go b/cmd/kpod/tag.go
index b5853ec14..f29c8c182 100644
--- a/cmd/kpod/tag.go
+++ b/cmd/kpod/tag.go
@@ -3,8 +3,8 @@ package main
import (
"github.com/containers/image/docker/reference"
"github.com/containers/storage"
- "github.com/projectatomic/libpod/libpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod"
"github.com/urfave/cli"
)
diff --git a/cmd/kpod/unpause.go b/cmd/kpod/unpause.go
index a17e70753..47a2e3778 100644
--- a/cmd/kpod/unpause.go
+++ b/cmd/kpod/unpause.go
@@ -2,8 +2,8 @@ package main
import (
"fmt"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
"os"
)
diff --git a/cmd/kpod/wait.go b/cmd/kpod/wait.go
index 7557bea49..5e8a50e13 100644
--- a/cmd/kpod/wait.go
+++ b/cmd/kpod/wait.go
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
- "github.com/projectatomic/libpod/libkpod"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libkpod"
"github.com/urfave/cli"
)