diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2022-09-12 16:52:08 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-12 16:52:08 +0200 |
| commit | 5abc08df252037e2984a2b532f17ba78fdd876d4 (patch) | |
| tree | 6d370a390a712c27f3e6c34c5e9646c29f1184a6 /pkg/rootless | |
| parent | 3b9e31c9bb0c36f30ed524ecef7accc1e1e76966 (diff) | |
| parent | 2c63b8439bbdc09203ea394ad2cf9352830861f0 (diff) | |
| download | podman-5abc08df252037e2984a2b532f17ba78fdd876d4.tar.gz podman-5abc08df252037e2984a2b532f17ba78fdd876d4.tar.bz2 podman-5abc08df252037e2984a2b532f17ba78fdd876d4.zip | |
Merge pull request #15511 from rhatdan/codespell
Fix stutters
Diffstat (limited to 'pkg/rootless')
| -rw-r--r-- | pkg/rootless/rootless_linux.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkg/rootless/rootless_linux.go b/pkg/rootless/rootless_linux.go index 8c4316dbb..f3453320f 100644 --- a/pkg/rootless/rootless_linux.go +++ b/pkg/rootless/rootless_linux.go @@ -401,12 +401,13 @@ func becomeRootInUserNS(pausePid, fileToRead string, fileOutput *os.File) (_ boo // Try to join it. data, err := ioutil.ReadFile(pausePid) if err == nil { - pid, err := strconv.ParseUint(string(data), 10, 0) + var pid uint64 + pid, err = strconv.ParseUint(string(data), 10, 0) if err == nil { return joinUserAndMountNS(uint(pid), "") } } - return false, -1, errors.New("setting up the process") + return false, -1, fmt.Errorf("setting up the process: %w", err) } if b[0] != '0' { |