diff options
| author | haircommander <pehunt@redhat.com> | 2018-08-20 17:56:35 -0400 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2018-08-23 18:16:28 +0000 |
| commit | 0e6266858a913ac36de0726ede10d5d03af533e3 (patch) | |
| tree | 152c7b8b029d5eb80c6caf466c9d0ab1b0ef3913 /libpod/pod_api.go | |
| parent | 2a7449362f2884d9ae6a783c0ce38979d882e2cf (diff) | |
| download | podman-0e6266858a913ac36de0726ede10d5d03af533e3.tar.gz podman-0e6266858a913ac36de0726ede10d5d03af533e3.tar.bz2 podman-0e6266858a913ac36de0726ede10d5d03af533e3.zip | |
Fixing network ns segfault
As well as small style corrections, update pod_top_test to use CreatePod, and move handling of adding a container to the pod's namespace from container_internal_linux to libpod/option.
Signed-off-by: haircommander <pehunt@redhat.com>
Closes: #1187
Approved by: mheon
Diffstat (limited to 'libpod/pod_api.go')
| -rw-r--r-- | libpod/pod_api.go | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/libpod/pod_api.go b/libpod/pod_api.go index ebb8753b8..0c518da0d 100644 --- a/libpod/pod_api.go +++ b/libpod/pod_api.go @@ -427,9 +427,6 @@ func (p *Pod) Inspect() (*PodInspect, error) { podContainers = append(podContainers, pc) } infraContainerID := p.state.InfraContainerID - if err != nil { - return &PodInspect{}, err - } config := new(PodConfig) deepcopier.Copy(p.config).To(config) |