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 /pkg/machine | |
| 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 'pkg/machine')
| -rw-r--r-- | pkg/machine/pull.go | 2 | ||||
| -rw-r--r-- | pkg/machine/qemu/machine.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/pkg/machine/pull.go b/pkg/machine/pull.go index 26abedfcd..7e6f01bad 100644 --- a/pkg/machine/pull.go +++ b/pkg/machine/pull.go @@ -129,7 +129,7 @@ func DownloadVMImage(downloadURL *url2.URL, localImagePath string) error { }() if resp.StatusCode != http.StatusOK { - return fmt.Errorf("error downloading VM image %s: %s", downloadURL, resp.Status) + return fmt.Errorf("downloading VM image %s: %s", downloadURL, resp.Status) } size := resp.ContentLength urlSplit := strings.Split(downloadURL.Path, "/") diff --git a/pkg/machine/qemu/machine.go b/pkg/machine/qemu/machine.go index 287b93612..ffc90b2a0 100644 --- a/pkg/machine/qemu/machine.go +++ b/pkg/machine/qemu/machine.go @@ -317,7 +317,7 @@ func (v *MachineVM) Init(opts machine.InitOptions) (bool, error) { resize.Stdout = os.Stdout resize.Stderr = os.Stderr if err := resize.Run(); err != nil { - return false, errors.Errorf("error resizing image: %q", err) + return false, errors.Errorf("resizing image: %q", err) } } // If the user provides an ignition file, we need to @@ -1078,7 +1078,7 @@ func (v *MachineVM) isIncompatible() bool { func (v *MachineVM) getForwardSocketPath() (string, error) { path, err := machine.GetDataDir(v.Name) if err != nil { - logrus.Errorf("Error resolving data dir: %s", err.Error()) + logrus.Errorf("Resolving data dir: %s", err.Error()) return "", nil } return filepath.Join(path, "podman.sock"), nil |