Fix stutters

Podman adds an Error: to every error message. So starting an error message with "error" ends up being reported to the user as Error: error ... This patch removes the stutter. Also ioutil.ReadFile errors report the Path, so wrapping the err message with the path causes a stutter. Signed-off-by: Daniel J Walsh <[email protected]>
Luap99 · Sep 10, 2022 · 2c63b84 · 2c63b84
1 parent 2d8417d
commit 2c63b84
Show file tree

Hide file tree

Showing 116 changed files with 580 additions and 579 deletions.
diff --git a/cmd/podman/containers/cp.go b/cmd/podman/containers/cp.go
@@ -172,7 +172,7 @@ func copyContainerToContainer(sourceContainer string, sourcePath string, destCon
 			return err
 		}
 		if err := copyFunc(); err != nil {
-			return fmt.Errorf("error copying from container: %w", err)
+			return fmt.Errorf("copying from container: %w", err)
 		}
 		return nil
 	}
@@ -192,7 +192,7 @@ func copyContainerToContainer(sourceContainer string, sourcePath string, destCon
 			return err
 		}
 		if err := copyFunc(); err != nil {
-			return fmt.Errorf("error copying to container: %w", err)
+			return fmt.Errorf("copying to container: %w", err)
 		}
 		return nil
 	}
@@ -315,7 +315,7 @@ func copyFromContainer(container string, containerPath string, hostPath string)
 			dir = filepath.Dir(dir)
 		}
 		if err := buildahCopiah.Put(dir, "", putOptions, reader); err != nil {
-			return fmt.Errorf("error copying to host: %w", err)
+			return fmt.Errorf("copying to host: %w", err)
 		}
 		return nil
 	}
@@ -327,7 +327,7 @@ func copyFromContainer(container string, containerPath string, hostPath string)
 			return err
 		}
 		if err := copyFunc(); err != nil {
-			return fmt.Errorf("error copying from container: %w", err)
+			return fmt.Errorf("copying from container: %w", err)
 		}
 		return nil
 	}
@@ -424,7 +424,7 @@ func copyToContainer(container string, containerPath string, hostPath string) er
 			getOptions.Rename = map[string]string{filepath.Base(hostTarget): containerBaseName}
 		}
 		if err := buildahCopiah.Get("/", "", getOptions, []string{hostTarget}, writer); err != nil {
-			return fmt.Errorf("error copying from host: %w", err)
+			return fmt.Errorf("copying from host: %w", err)
 		}
 		return nil
 	}
@@ -441,7 +441,7 @@ func copyToContainer(container string, containerPath string, hostPath string) er
 			return err
 		}
 		if err := copyFunc(); err != nil {
-			return fmt.Errorf("error copying to container: %w", err)
+			return fmt.Errorf("copying to container: %w", err)
 		}
 		return nil
 	}

diff --git a/cmd/podman/containers/exec.go b/cmd/podman/containers/exec.go
@@ -126,7 +126,7 @@ func exec(_ *cobra.Command, args []string) error {
 
 	cliEnv, err := envLib.ParseSlice(envInput)
 	if err != nil {
-		return fmt.Errorf("error parsing environment variables: %w", err)
+		return fmt.Errorf("parsing environment variables: %w", err)
 	}
 
 	execOpts.Envs = envLib.Join(execOpts.Envs, cliEnv)

diff --git a/cmd/podman/containers/kill.go b/cmd/podman/containers/kill.go
@@ -98,7 +98,7 @@ func kill(_ *cobra.Command, args []string) error {
 	for _, cidFile := range killCidFiles {
 		content, err := ioutil.ReadFile(cidFile)
 		if err != nil {
-			return fmt.Errorf("error reading CIDFile: %w", err)
+			return fmt.Errorf("reading CIDFile: %w", err)
 		}
 		id := strings.Split(string(content), "\n")[0]
 		args = append(args, id)

diff --git a/cmd/podman/containers/logs.go b/cmd/podman/containers/logs.go
@@ -126,15 +126,15 @@ func logs(_ *cobra.Command, args []string) error {
 		// parse time, error out if something is wrong
 		since, err := util.ParseInputTime(logsOptions.SinceRaw, true)
 		if err != nil {
-			return fmt.Errorf("error parsing --since %q: %w", logsOptions.SinceRaw, err)
+			return fmt.Errorf("parsing --since %q: %w", logsOptions.SinceRaw, err)
 		}
 		logsOptions.Since = since
 	}
 	if logsOptions.UntilRaw != "" {
 		// parse time, error out if something is wrong
 		until, err := util.ParseInputTime(logsOptions.UntilRaw, false)
 		if err != nil {
-			return fmt.Errorf("error parsing --until %q: %w", logsOptions.UntilRaw, err)
+			return fmt.Errorf("parsing --until %q: %w", logsOptions.UntilRaw, err)
 		}
 		logsOptions.Until = until
 	}

diff --git a/cmd/podman/containers/pause.go b/cmd/podman/containers/pause.go
@@ -94,7 +94,7 @@ func pause(cmd *cobra.Command, args []string) error {
 	for _, cidFile := range pauseCidFiles {
 		content, err := ioutil.ReadFile(cidFile)
 		if err != nil {
-			return fmt.Errorf("error reading CIDFile: %w", err)
+			return fmt.Errorf("reading CIDFile: %w", err)
 		}
 		id := strings.Split(string(content), "\n")[0]
 		args = append(args, id)

diff --git a/cmd/podman/containers/restart.go b/cmd/podman/containers/restart.go
@@ -107,7 +107,7 @@ func restart(cmd *cobra.Command, args []string) error {
 	for _, cidFile := range restartCidFiles {
 		content, err := ioutil.ReadFile(cidFile)
 		if err != nil {
-			return fmt.Errorf("error reading CIDFile: %w", err)
+			return fmt.Errorf("reading CIDFile: %w", err)
 		}
 		id := strings.Split(string(content), "\n")[0]
 		args = append(args, id)

diff --git a/cmd/podman/containers/rm.go b/cmd/podman/containers/rm.go
@@ -110,7 +110,7 @@ func rm(cmd *cobra.Command, args []string) error {
 	for _, cidFile := range rmCidFiles {
 		content, err := ioutil.ReadFile(cidFile)
 		if err != nil {
-			return fmt.Errorf("error reading CIDFile: %w", err)
+			return fmt.Errorf("reading CIDFile: %w", err)
 		}
 		id := strings.Split(string(content), "\n")[0]
 		args = append(args, id)

diff --git a/cmd/podman/containers/stop.go b/cmd/podman/containers/stop.go
@@ -107,7 +107,7 @@ func stop(cmd *cobra.Command, args []string) error {
 	for _, cidFile := range stopCidFiles {
 		content, err := ioutil.ReadFile(cidFile)
 		if err != nil {
-			return fmt.Errorf("error reading CIDFile: %w", err)
+			return fmt.Errorf("reading CIDFile: %w", err)
 		}
 		id := strings.Split(string(content), "\n")[0]
 		args = append(args, id)

diff --git a/cmd/podman/containers/unpause.go b/cmd/podman/containers/unpause.go
@@ -101,7 +101,7 @@ func unpause(cmd *cobra.Command, args []string) error {
 	for _, cidFile := range unpauseCidFiles {
 		content, err := ioutil.ReadFile(cidFile)
 		if err != nil {
-			return fmt.Errorf("error reading CIDFile: %w", err)
+			return fmt.Errorf("reading CIDFile: %w", err)
 		}
 		id := strings.Split(string(content), "\n")[0]
 		args = append(args, id)

diff --git a/cmd/podman/early_init_linux.go b/cmd/podman/early_init_linux.go
@@ -14,11 +14,11 @@ func setRLimits() error {
 	rlimits.Max = define.RLimitDefaultValue
 	if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
 		if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
-			return fmt.Errorf("error getting rlimits: %w", err)
+			return fmt.Errorf("getting rlimits: %w", err)
 		}
 		rlimits.Cur = rlimits.Max
 		if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, rlimits); err != nil {
-			return fmt.Errorf("error setting new rlimits: %w", err)
+			return fmt.Errorf("setting new rlimits: %w", err)
 		}
 	}
 	return nil

diff --git a/cmd/podman/generate/systemd.go b/cmd/podman/generate/systemd.go
@@ -150,7 +150,7 @@ func systemd(cmd *cobra.Command, args []string) error {
 	if cmd.Flags().Changed(envFlagName) {
 		cliEnv, err := envLib.ParseSlice(envInput)
 		if err != nil {
-			return fmt.Errorf("error parsing environment variables: %w", err)
+			return fmt.Errorf("parsing environment variables: %w", err)
 		}
 		systemdOptions.AdditionalEnvVariables = envLib.Slice(cliEnv)
 	}
@@ -169,7 +169,7 @@ func systemd(cmd *cobra.Command, args []string) error {
 	if files {
 		cwd, err := os.Getwd()
 		if err != nil {
-			return fmt.Errorf("error getting current working directory: %w", err)
+			return fmt.Errorf("getting current working directory: %w", err)
 		}
 		for name, content := range reports.Units {
 			path := filepath.Join(cwd, fmt.Sprintf("%s.service", name))

diff --git a/cmd/podman/images/build.go b/cmd/podman/images/build.go
@@ -222,7 +222,7 @@ func build(cmd *cobra.Command, args []string) error {
 		// The context directory could be a URL.  Try to handle that.
 		tempDir, subDir, err := buildahDefine.TempDirForURL("", "buildah", args[0])
 		if err != nil {
-			return fmt.Errorf("error prepping temporary context directory: %w", err)
+			return fmt.Errorf("prepping temporary context directory: %w", err)
 		}
 		if tempDir != "" {
 			// We had to download it to a temporary directory.
@@ -237,7 +237,7 @@ func build(cmd *cobra.Command, args []string) error {
 			// Nope, it was local.  Use it as is.
 			absDir, err := filepath.Abs(args[0])
 			if err != nil {
-				return fmt.Errorf("error determining path to directory %q: %w", args[0], err)
+				return fmt.Errorf("determining path to directory %q: %w", args[0], err)
 			}
 			contextDir = absDir
 		}
@@ -253,7 +253,7 @@ func build(cmd *cobra.Command, args []string) error {
 			}
 			absFile, err := filepath.Abs(containerFiles[i])
 			if err != nil {
-				return fmt.Errorf("error determining path to file %q: %w", containerFiles[i], err)
+				return fmt.Errorf("determining path to file %q: %w", containerFiles[i], err)
 			}
 			contextDir = filepath.Dir(absFile)
 			containerFiles[i] = absFile

diff --git a/cmd/podman/images/list.go b/cmd/podman/images/list.go
@@ -225,7 +225,7 @@ func sortImages(imageS []*entities.ImageSummary) ([]imageReporter, error) {
 				h.ImageSummary = *e
 				h.Repository, h.Tag, err = tokenRepoTag(tag)
 				if err != nil {
-					return nil, fmt.Errorf("error parsing repository tag: %q: %w", tag, err)
+					return nil, fmt.Errorf("parsing repository tag: %q: %w", tag, err)
 				}
 				if h.Tag == "<none>" {
 					untagged = append(untagged, h)

diff --git a/cmd/podman/images/utils_linux.go b/cmd/podman/images/utils_linux.go
@@ -26,7 +26,7 @@ func setupPipe() (string, func() <-chan error, error) {
 		if e := os.RemoveAll(pipeDir); e != nil {
 			logrus.Errorf("Removing named pipe: %q", e)
 		}
-		return "", nil, fmt.Errorf("error creating named pipe: %w", err)
+		return "", nil, fmt.Errorf("creating named pipe: %w", err)
 	}
 	go func() {
 		fpipe, err := os.Open(pipePath)

diff --git a/cmd/podman/machine/info.go b/cmd/podman/machine/info.go
@@ -57,7 +57,7 @@ func info(cmd *cobra.Command, args []string) error {
 	info := entities.MachineInfo{}
 	version, err := define.GetVersion()
 	if err != nil {
-		return fmt.Errorf("error getting version info %w", err)
+		return fmt.Errorf("getting version info %w", err)
 	}
 	info.Version = version
 

diff --git a/cmd/podman/pods/logs.go b/cmd/podman/pods/logs.go
@@ -101,15 +101,15 @@ func logs(_ *cobra.Command, args []string) error {
 		// parse time, error out if something is wrong
 		since, err := util.ParseInputTime(logsPodOptions.SinceRaw, true)
 		if err != nil {
-			return fmt.Errorf("error parsing --since %q: %w", logsPodOptions.SinceRaw, err)
+			return fmt.Errorf("parsing --since %q: %w", logsPodOptions.SinceRaw, err)
 		}
 		logsPodOptions.Since = since
 	}
 	if logsPodOptions.UntilRaw != "" {
 		// parse time, error out if something is wrong
 		until, err := util.ParseInputTime(logsPodOptions.UntilRaw, false)
 		if err != nil {
-			return fmt.Errorf("error parsing --until %q: %w", logsPodOptions.UntilRaw, err)
+			return fmt.Errorf("parsing --until %q: %w", logsPodOptions.UntilRaw, err)
 		}
 		logsPodOptions.Until = until
 	}

diff --git a/cmd/podman/system/dial_stdio.go b/cmd/podman/system/dial_stdio.go
@@ -97,7 +97,7 @@ func copier(to halfWriteCloser, from halfReadCloser, debugDescription string) er
 		}
 	}()
 	if _, err := io.Copy(to, from); err != nil {
-		return fmt.Errorf("error while Copy (%s): %w", debugDescription, err)
+		return fmt.Errorf("while Copy (%s): %w", debugDescription, err)
 	}
 	return nil
 }

diff --git a/docs/tutorials/image_signing.md b/docs/tutorials/image_signing.md
@@ -173,7 +173,7 @@ Then a pull is not possible any more:
 ```bash
 sudo podman pull --tls-verify=false localhost:5000/alpine
 Trying to pull localhost:5000/alpine...
-Error: error pulling image "localhost:5000/alpine": unable to pull localhost:5000/alpine: unable to pull image: Source image rejected: Invalid GPG signature: …
+Error: pulling image "localhost:5000/alpine": unable to pull localhost:5000/alpine: unable to pull image: Source image rejected: Invalid GPG signature: …
 ```
 
 So in general there are four main things to be taken into consideration when

diff --git a/hack/podman-registry-go/registry.go b/hack/podman-registry-go/registry.go
@@ -57,7 +57,7 @@ func StartWithOptions(options *Options) (*Registry, error) {
 	// Start a registry.
 	out, err := utils.ExecCmd(binary, args...)
 	if err != nil {
-		return nil, fmt.Errorf("error running %q: %s: %w", binary, out, err)
+		return nil, fmt.Errorf("running %q: %s: %w", binary, out, err)
 	}
 
 	// Parse the output.
@@ -112,7 +112,7 @@ func (r *Registry) Stop() error {
 		return nil
 	}
 	if _, err := utils.ExecCmd(binary, "-P", r.Port, "stop"); err != nil {
-		return fmt.Errorf("error stopping registry (%v) with %q: %w", *r, binary, err)
+		return fmt.Errorf("stopping registry (%v) with %q: %w", *r, binary, err)
 	}
 	r.running = false
 	return nil