Skip to content

refactor: remove redundant err.Error() calls #29539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ravencore06 wants to merge 1 commit into
base: main
Choose a base branch
from
+7 −7
Open

refactor: remove redundant err.Error() calls #29539

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions cmd/podman/root.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,7 @@ func persistentPreRunE(cmd *cobra.Command, args []string) error {
// Hard code TMPDIR functions to use /var/tmp, if user did not override
if _, ok := os.LookupEnv("TMPDIR"); !ok {
if tmpdir, err := podmanConfig.ContainersConfDefaultsRO.ImageCopyTmpDir(); err != nil {
logrus.Warnf("Failed to retrieve default tmp dir: %s", err.Error())
logrus.Warnf("Failed to retrieve default tmp dir: %v", err)
} else {
os.Setenv("TMPDIR", tmpdir)
}
Expand Down Expand Up @@ -474,7 +474,7 @@ func configHook() {
if err != nil && !errors.Is(err, fs.ErrNotExist) {
// Cases where the folder does not exist are allowed, BUT cases where some other Stat() error
// is returned should fail
fmt.Fprintf(os.Stderr, "Supplied --config folder (%s) exists but is not accessible: %s\n", dockerConfig, err.Error())
fmt.Fprintf(os.Stderr, "Supplied --config folder (%s) exists but is not accessible: %v\n", dockerConfig, err)
os.Exit(1)
}
if err == nil && !statInfo.IsDir() {
Expand All @@ -483,7 +483,7 @@ func configHook() {
os.Exit(1)
}
if err := os.Setenv("DOCKER_CONFIG", dockerConfig); err != nil {
fmt.Fprintf(os.Stderr, "cannot set DOCKER_CONFIG=%s: %s\n", dockerConfig, err.Error())
fmt.Fprintf(os.Stderr, "cannot set DOCKER_CONFIG=%s: %v\n", dockerConfig, err)
os.Exit(1)
}
}
Expand Down Expand Up @@ -529,7 +529,7 @@ func stdOutHook() {

// if we couldn't open the file for write, then just bail with an error.
} else {
fmt.Fprintf(os.Stderr, "unable to open file for standard output: %s\n", err.Error())
fmt.Fprintf(os.Stderr, "unable to open file for standard output: %v\n", err)
os.Exit(1)
}
}
Expand Down Expand Up @@ -594,7 +594,7 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) {
pFlags := cmd.PersistentFlags()
if registry.IsRemote() {
if err := lFlags.MarkHidden("remote"); err != nil {
logrus.Warnf("Unable to mark --remote flag as hidden: %s", err.Error())
logrus.Warnf("Unable to mark --remote flag as hidden: %v", err)
}
podmanConfig.Remote = true
} else {
Expand Down Expand Up @@ -697,7 +697,7 @@ func rootFlags(cmd *cobra.Command, podmanConfig *entities.PodmanConfig) {
"trace",
} {
if err := pFlags.MarkHidden(f); err != nil {
logrus.Warnf("Unable to mark %s flag as hidden: %s", f, err.Error())
logrus.Warnf("Unable to mark %s flag as hidden: %v", f, err)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/domain/infra/abi/generate.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func (ic *ContainerEngine) GenerateSystemd(_ context.Context, nameOrID string, o
// If it's not a container, we either have a pod or garbage.
pod, err := ic.Libpod.LookupPod(nameOrID)
if err != nil {
err = fmt.Errorf("%v: %w", err.Error(), ctrErr)
err = fmt.Errorf("%v: %w", err, ctrErr)
return nil, fmt.Errorf("%s does not refer to a container or pod: %w", nameOrID, err)
}

Expand Down