summaryrefslogtreecommitdiff
path: root/pkg/trust
diff options
context:
space:
mode:
authorKir Kolyshkin <kolyshkin@gmail.com>2020-10-05 12:33:53 -0700
committerKir Kolyshkin <kolyshkin@gmail.com>2020-10-05 15:30:37 -0700
commit4878dff3e2c89382699c29c10dc5036367275575 (patch)
tree5215fd4238ac12dc81af595d1ee3b174430769c5 /pkg/trust
parent1b16fcfd14b9e761849e53ac2b83c964ad8ac5a9 (diff)
downloadpodman-4878dff3e2c89382699c29c10dc5036367275575.tar.gz
podman-4878dff3e2c89382699c29c10dc5036367275575.tar.bz2
podman-4878dff3e2c89382699c29c10dc5036367275575.zip
Remove excessive error wrapping
In case os.Open[File], os.Mkdir[All], ioutil.ReadFile and the like fails, the error message already contains the file name and the operation that fails, so there is no need to wrap the error with something like "open %s failed". While at it - replace a few places with os.Open, ioutil.ReadAll with ioutil.ReadFile. - replace errors.Wrapf with errors.Wrap for cases where there are no %-style arguments. Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com>
Diffstat (limited to 'pkg/trust')
-rw-r--r--pkg/trust/trust.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/pkg/trust/trust.go b/pkg/trust/trust.go
index 2348bc410..073b46c8d 100644
--- a/pkg/trust/trust.go
+++ b/pkg/trust/trust.go
@@ -226,10 +226,10 @@ func GetPolicy(policyPath string) (PolicyContent, error) {
var policyContentStruct PolicyContent
policyContent, err := ioutil.ReadFile(policyPath)
if err != nil {
- return policyContentStruct, errors.Wrapf(err, "unable to read policy file %s", policyPath)
+ return policyContentStruct, errors.Wrap(err, "unable to read policy file")
}
if err := json.Unmarshal(policyContent, &policyContentStruct); err != nil {
- return policyContentStruct, errors.Wrapf(err, "could not parse trust policies")
+ return policyContentStruct, errors.Wrapf(err, "could not parse trust policies from %s", policyPath)
}
return policyContentStruct, nil
}