opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-23 02:18:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3023 from vrothberg/update-psgo

Browse Source 
update psgo to v1.2.1
This commit is contained in:
OpenShift Merge Robot
2019-04-26 06:35:28 -07:00
committed by GitHub
parent e2d7e325f4 01ae700a17
commit 135c8bef22
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vendor.conf
View File

@ -20,7 +20,7 @@ github.com/vbauerster/mpb v3.3.4
github.com/mattn/go-isatty v0.0.4 github.com/mattn/go-isatty v0.0.4
github.com/VividCortex/ewma v1.1.1 github.com/VividCortex/ewma v1.1.1
github.com/containers/storage v1.12.3 github.com/containers/storage v1.12.3
github.com/containers/psgo v1.2 github.com/containers/psgo v1.2.1
github.com/coreos/go-systemd v14 github.com/coreos/go-systemd v14
github.com/coreos/pkg v4 github.com/coreos/pkg v4
github.com/cri-o/ocicni 0c180f981b27ef6036fa5be29bcb4dd666e406eb github.com/cri-o/ocicni 0c180f981b27ef6036fa5be29bcb4dd666e406eb

11
vendor/github.com/containers/psgo/psgo.go generated vendored
View File

@ -93,7 +93,7 @@ func translateDescriptors(descriptors []string) ([]aixFormatDescriptor, error) {
} }
} }
if !found { if !found {
return nil, errors.Wrapf(ErrUnkownDescriptor, "'%s'", d) return nil, errors.Wrapf(ErrUnknownDescriptor, "'%s'", d)
} }
} }
@ -104,8 +104,8 @@ var (
// DefaultDescriptors is the `ps -ef` compatible default format. // DefaultDescriptors is the `ps -ef` compatible default format.
DefaultDescriptors = []string{"user", "pid", "ppid", "pcpu", "etime", "tty", "time", "args"} DefaultDescriptors = []string{"user", "pid", "ppid", "pcpu", "etime", "tty", "time", "args"}
// ErrUnkownDescriptor is returned when an unknown descriptor is parsed. // ErrUnknownDescriptor is returned when an unknown descriptor is parsed.
ErrUnkownDescriptor = errors.New("unknown descriptor") ErrUnknownDescriptor = errors.New("unknown descriptor")
aixFormatDescriptors = []aixFormatDescriptor{ aixFormatDescriptors = []aixFormatDescriptor{
{ {
@ -327,7 +327,10 @@ func JoinNamespaceAndProcessInfo(pid string, descriptors []string) ([][]string,
dataErr = err dataErr = err
return return
} }
unix.Setns(int(fd.Fd()), unix.CLONE_NEWNS) if err := unix.Setns(int(fd.Fd()), unix.CLONE_NEWNS); err != nil {
dataErr = err
return
}
// extract all pids mentioned in pid's mount namespace // extract all pids mentioned in pid's mount namespace
pids, err := proc.GetPIDs() pids, err := proc.GetPIDs()