summaryrefslogtreecommitdiff
path: root/libpod
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 /libpod
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 'libpod')
-rw-r--r--libpod/container.go5
-rw-r--r--libpod/container_attach.go2
-rw-r--r--libpod/diff.go2
-rw-r--r--libpod/images/image_data.go2
-rw-r--r--libpod/in_memory_state.go2
-rw-r--r--libpod/runtime_img.go2
6 files changed, 7 insertions, 8 deletions
diff --git a/libpod/container.go b/libpod/container.go
index 50fe18939..9f9d4ef3e 100644
--- a/libpod/container.go
+++ b/libpod/container.go
@@ -10,14 +10,13 @@ import (
"github.com/containers/storage"
"github.com/docker/docker/pkg/stringid"
- crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
+ "github.com/docker/docker/pkg/term"
spec "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"
+ crioAnnotations "github.com/projectatomic/libpod/pkg/annotations"
"github.com/sirupsen/logrus"
"github.com/ulule/deepcopier"
- "github.com/docker/docker/pkg/term"
"k8s.io/client-go/tools/remotecommand"
-
)
// ContainerState represents the current state of a container
diff --git a/libpod/container_attach.go b/libpod/container_attach.go
index 0063058a2..e308df4a4 100644
--- a/libpod/container_attach.go
+++ b/libpod/container_attach.go
@@ -9,8 +9,8 @@ import (
"strconv"
"github.com/docker/docker/pkg/term"
- "github.com/projectatomic/libpod/utils"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/utils"
"github.com/sirupsen/logrus"
"golang.org/x/sys/unix"
"k8s.io/client-go/tools/remotecommand"
diff --git a/libpod/diff.go b/libpod/diff.go
index 571c58de8..cd64520a8 100644
--- a/libpod/diff.go
+++ b/libpod/diff.go
@@ -2,8 +2,8 @@ package libpod
import (
"github.com/containers/storage/pkg/archive"
- "github.com/projectatomic/libpod/libpod/layers"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod/layers"
)
// GetDiff returns the differences between the two images, layers, or containers
diff --git a/libpod/images/image_data.go b/libpod/images/image_data.go
index 0295578c5..b64ac557f 100644
--- a/libpod/images/image_data.go
+++ b/libpod/images/image_data.go
@@ -9,10 +9,10 @@ import (
"github.com/containers/image/transports"
"github.com/containers/image/types"
"github.com/containers/storage"
- "github.com/projectatomic/libpod/libpod/driver"
digest "github.com/opencontainers/go-digest"
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod/driver"
)
// Data handles the data used when inspecting a container
diff --git a/libpod/in_memory_state.go b/libpod/in_memory_state.go
index e815dce3c..dd193f57b 100644
--- a/libpod/in_memory_state.go
+++ b/libpod/in_memory_state.go
@@ -2,8 +2,8 @@ package libpod
import (
"github.com/docker/docker/pkg/truncindex"
- "github.com/projectatomic/libpod/pkg/registrar"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/pkg/registrar"
)
// An InMemoryState is a purely in-memory state store
diff --git a/libpod/runtime_img.go b/libpod/runtime_img.go
index a058380a1..d291840e9 100644
--- a/libpod/runtime_img.go
+++ b/libpod/runtime_img.go
@@ -23,10 +23,10 @@ import (
"github.com/containers/image/types"
"github.com/containers/storage"
"github.com/containers/storage/pkg/archive"
- "github.com/projectatomic/libpod/libpod/common"
digest "github.com/opencontainers/go-digest"
ociv1 "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors"
+ "github.com/projectatomic/libpod/libpod/common"
)
// Runtime API