From 2c63b8439bbdc09203ea394ad2cf9352830861f0 Mon Sep 17 00:00:00 2001 From: Daniel J Walsh Date: Sat, 10 Sep 2022 07:40:39 -0400 Subject: 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 --- pkg/trust/policy.go | 2 +- pkg/trust/registries.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'pkg/trust') diff --git a/pkg/trust/policy.go b/pkg/trust/policy.go index 326fe17af..d746e78cf 100644 --- a/pkg/trust/policy.go +++ b/pkg/trust/policy.go @@ -242,7 +242,7 @@ func AddPolicyEntries(policyPath string, input AddPolicyEntriesInput) error { data, err := json.MarshalIndent(policyContentStruct, "", " ") if err != nil { - return fmt.Errorf("error setting trust policy: %w", err) + return fmt.Errorf("setting trust policy: %w", err) } return ioutil.WriteFile(policyPath, data, 0644) } diff --git a/pkg/trust/registries.go b/pkg/trust/registries.go index 0adc38232..86d580059 100644 --- a/pkg/trust/registries.go +++ b/pkg/trust/registries.go @@ -79,7 +79,7 @@ func loadAndMergeConfig(dirPath string) (*registryConfiguration, error) { var config registryConfiguration err = yaml.Unmarshal(configBytes, &config) if err != nil { - return nil, fmt.Errorf("error parsing %s: %w", configPath, err) + return nil, fmt.Errorf("parsing %s: %w", configPath, err) } if config.DefaultDocker != nil { if mergedConfig.DefaultDocker != nil { -- cgit v1.2.3-54-g00ecf