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 /pkg/machine | |
| 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 '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 |