summaryrefslogtreecommitdiff
path: root/vendor/github.com/prometheus/procfs/zoneinfo.go
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2021-03-26 19:38:49 +0000
committerGitHub <noreply@github.com>2021-03-26 19:38:49 +0000
commitf3024b906ce717f7858c138a9c1daf72bdb8d132 (patch)
tree2c1adfa8ca6f622a88f03402dc7ff49524bf388d /vendor/github.com/prometheus/procfs/zoneinfo.go
parentc81e273835303664d62c4e958a7f34877c05ed49 (diff)
parentfc197fb4f5c0e0d90da39fe672bce7d145272415 (diff)
downloadpodman-f3024b906ce717f7858c138a9c1daf72bdb8d132.tar.gz
podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.tar.bz2
podman-f3024b906ce717f7858c138a9c1daf72bdb8d132.zip
Merge pull request #9821 from rhatdan/VENDOR
[NO TESTS NEEDED] Vendor in containers/buildah v1.20.0
Diffstat (limited to 'vendor/github.com/prometheus/procfs/zoneinfo.go')
-rw-r--r--vendor/github.com/prometheus/procfs/zoneinfo.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/vendor/github.com/prometheus/procfs/zoneinfo.go b/vendor/github.com/prometheus/procfs/zoneinfo.go
index e941503d5..0b9bb6796 100644
--- a/vendor/github.com/prometheus/procfs/zoneinfo.go
+++ b/vendor/github.com/prometheus/procfs/zoneinfo.go
@@ -74,11 +74,11 @@ var nodeZoneRE = regexp.MustCompile(`(\d+), zone\s+(\w+)`)
func (fs FS) Zoneinfo() ([]Zoneinfo, error) {
data, err := ioutil.ReadFile(fs.proc.Path("zoneinfo"))
if err != nil {
- return nil, fmt.Errorf("error reading zoneinfo %s: %s", fs.proc.Path("zoneinfo"), err)
+ return nil, fmt.Errorf("error reading zoneinfo %q: %w", fs.proc.Path("zoneinfo"), err)
}
zoneinfo, err := parseZoneinfo(data)
if err != nil {
- return nil, fmt.Errorf("error parsing zoneinfo %s: %s", fs.proc.Path("zoneinfo"), err)
+ return nil, fmt.Errorf("error parsing zoneinfo %q: %w", fs.proc.Path("zoneinfo"), err)
}
return zoneinfo, nil
}