RobbyV2/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-09-06 13:53:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #14789 from saschagrunert/libpod-errors

Browse Source 
libpod/runtime: switch to golang native error wrapping
This commit is contained in:
openshift-ci[bot]
2022-07-05 07:23:22 +00:00
committed by GitHub
parent 3e7e66edad 597de7a083
commit 773eead54e
19 changed files with 391 additions and 318 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
utils/utils.go
View File

@@ -16,7 +16,6 @@ import (
"github.com/containers/podman/v4/libpod/define"
"github.com/containers/storage/pkg/archive"
"github.com/godbus/dbus/v5"
"github.com/pkg/errors"
"github.com/sirupsen/logrus"
)
@@ -114,7 +113,7 @@ func UntarToFileSystem(dest string, tarball *os.File, options *archive.TarOption
func CreateTarFromSrc(source string, dest string) error {
file, err := os.Create(dest)
if err != nil {
return errors.Wrapf(err, "Could not create tarball file '%s'", dest)
return fmt.Errorf("could not create tarball file '%s': %w", dest, err)
}
defer file.Close()
return TarToFilesystem(source, file)
@@ -154,7 +153,7 @@ func RemoveScientificNotationFromFloat(x float64) (float64, error) {
}
result, err := strconv.ParseFloat(bigNum, 64)
if err != nil {
return x, errors.Wrapf(err, "unable to remove scientific number from calculations")
return x, fmt.Errorf("unable to remove scientific number from calculations: %w", err)
}
return result, nil
}
@@ -181,11 +180,11 @@ func moveProcessPIDFileToScope(pidPath, slice, scope string) error {
if os.IsNotExist(err) {
return nil
}
return errors.Wrapf(err, "cannot read pid file %s", pidPath)
return fmt.Errorf("cannot read pid file %s: %w", pidPath, err)
}
pid, err := strconv.ParseUint(string(data), 10, 0)
if err != nil {
return errors.Wrapf(err, "cannot parse pid file %s", pidPath)
return fmt.Errorf("cannot parse pid file %s: %w", pidPath, err)
}
return moveProcessToScope(int(pid), slice, scope)