diff options
| author | Daniel J Walsh <dwalsh@redhat.com> | 2022-03-25 08:19:39 -0400 |
|---|---|---|
| committer | Daniel J Walsh <dwalsh@redhat.com> | 2022-03-25 21:47:04 -0400 |
| commit | 7680211edefc32d97c6ec82062afa7a1ea00a001 (patch) | |
| tree | 6892ea68e1c9ee8d247502a9f3ece19e70262989 /libpod | |
| parent | dd2a28bfe623a722bb1126acf7c7148f7bb11847 (diff) | |
| download | podman-7680211edefc32d97c6ec82062afa7a1ea00a001.tar.gz podman-7680211edefc32d97c6ec82062afa7a1ea00a001.tar.bz2 podman-7680211edefc32d97c6ec82062afa7a1ea00a001.zip | |
Remove error stutter
When podman gets an error it prints out "Error: " before
printing the error string. If the error message starts with
error, we end up with
Error: error ...
This PR Removes all of these stutters.
logrus.Error() also prints out that this is an error, so no need for the
error stutter.
[NO NEW TESTS NEEDED]
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
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 a7a002657..3af0df3d1 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") |