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 /cmd/podman/images | |
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 'cmd/podman/images')
-rw-r--r-- | cmd/podman/images/import.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/load.go | 4 | ||||
-rw-r--r-- | cmd/podman/images/scp.go | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/cmd/podman/images/import.go b/cmd/podman/images/import.go index 47f2a798d..1910fef6d 100644 --- a/cmd/podman/images/import.go +++ b/cmd/podman/images/import.go @@ -118,14 +118,14 @@ func importCon(cmd *cobra.Command, args []string) error { if source == "-" { outFile, err := ioutil.TempFile("", "podman") if err != nil { - return errors.Errorf("error creating file %v", err) + return errors.Errorf("creating file %v", err) } defer os.Remove(outFile.Name()) defer outFile.Close() _, err = io.Copy(outFile, os.Stdin) if err != nil { - return errors.Errorf("error copying file %v", err) + return errors.Errorf("copying file %v", err) } source = outFile.Name() } diff --git a/cmd/podman/images/load.go b/cmd/podman/images/load.go index bbcfe93ce..30f88b02b 100644 --- a/cmd/podman/images/load.go +++ b/cmd/podman/images/load.go @@ -95,14 +95,14 @@ func load(cmd *cobra.Command, args []string) error { } outFile, err := ioutil.TempFile(util.Tmpdir(), "podman") if err != nil { - return errors.Errorf("error creating file %v", err) + return errors.Errorf("creating file %v", err) } defer os.Remove(outFile.Name()) defer outFile.Close() _, err = io.Copy(outFile, os.Stdin) if err != nil { - return errors.Errorf("error copying file %v", err) + return errors.Errorf("copying file %v", err) } loadOpts.Input = outFile.Name() } diff --git a/cmd/podman/images/scp.go b/cmd/podman/images/scp.go index 152275c68..51a9d1c4e 100644 --- a/cmd/podman/images/scp.go +++ b/cmd/podman/images/scp.go @@ -268,7 +268,7 @@ func saveToRemote(image, localFile string, tag string, uri *urlP.URL, iden strin } n, err := scpD.CopyFrom(dial, remoteFile, localFile) if _, conErr := connection.ExecRemoteCommand(dial, "rm "+remoteFile); conErr != nil { - logrus.Errorf("Error removing file on endpoint: %v", conErr) + logrus.Errorf("Removing file on endpoint: %v", conErr) } if err != nil { errOut := strconv.Itoa(int(n)) + " Bytes copied before error" |