diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-03-27 13:11:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-03-27 13:11:31 +0200 |
| commit | ddfa087d002a7acf1fb34388e8cec17a2c9efae6 (patch) | |
| tree | ea8595903bf31e7f6b6e1f02a76e63c2f51c8fec /libpod | |
| parent | 28504f5dd4f37fd9b049c0081a1b0619a191f4de (diff) | |
| parent | 7680211edefc32d97c6ec82062afa7a1ea00a001 (diff) | |
| download | podman-ddfa087d002a7acf1fb34388e8cec17a2c9efae6.tar.gz podman-ddfa087d002a7acf1fb34388e8cec17a2c9efae6.tar.bz2 podman-ddfa087d002a7acf1fb34388e8cec17a2c9efae6.zip | |
Merge pull request #13660 from rhatdan/error
Remove error stutter
Diffstat (limited to 'libpod')
| -rw-r--r-- | libpod/networking_linux.go | 2 | ||||
| -rw-r--r-- | libpod/networking_slirp4netns.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libpod/networking_linux.go b/libpod/networking_linux.go index 20c8059a5..db36ac75d 100644 --- a/libpod/networking_linux.go +++ b/libpod/networking_linux.go @@ -1002,7 +1002,7 @@ func (c *Container) getContainerNetworkInfo() (*define.InspectNetworkSettings, e } } // do not propagate error inspecting a joined network ns - logrus.Errorf("Error inspecting network namespace: %s of container %s: %v", networkNSPath, c.ID(), err) + logrus.Errorf("Inspecting network namespace: %s of container %s: %v", networkNSPath, c.ID(), err) } // We can't do more if the network is down. diff --git a/libpod/networking_slirp4netns.go b/libpod/networking_slirp4netns.go index 38a02e902..b0247dc5c 100644 --- a/libpod/networking_slirp4netns.go +++ b/libpod/networking_slirp4netns.go @@ -662,7 +662,7 @@ func (r *Runtime) setupRootlessPortMappingViaSlirp(ctr *Container, cmd *exec.Cmd return errors.Wrapf(err, "error parsing error status from slirp4netns") } if e, found := y["error"]; found { - return errors.Errorf("error from slirp4netns while setting up port redirection: %v", e) + return errors.Errorf("from slirp4netns while setting up port redirection: %v", e) } } logrus.Debug("slirp4netns port-forwarding setup via add_hostfwd is ready") |