diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-06-24 16:52:02 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-06-24 16:52:02 +0200 |
| commit | 72260a296c534950d9c899ee907e73b5dd0162f0 (patch) | |
| tree | d9b33042a70c2d1e600c75855a29b3aa594aaab6 /vendor/github.com/docker/go-units/ulimit.go | |
| parent | cf244d87cdb9b2cb0d8510b2ea392d928c1eb269 (diff) | |
| parent | d697456dc90adbaf68224ed7c115b38d5855e582 (diff) | |
| download | podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.gz podman-72260a296c534950d9c899ee907e73b5dd0162f0.tar.bz2 podman-72260a296c534950d9c899ee907e73b5dd0162f0.zip | |
Merge pull request #3414 from vrothberg/go-modules
Go modules
Diffstat (limited to 'vendor/github.com/docker/go-units/ulimit.go')
| -rw-r--r-- | vendor/github.com/docker/go-units/ulimit.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/vendor/github.com/docker/go-units/ulimit.go b/vendor/github.com/docker/go-units/ulimit.go index 5ac7fd825..fca0400cc 100644 --- a/vendor/github.com/docker/go-units/ulimit.go +++ b/vendor/github.com/docker/go-units/ulimit.go @@ -96,8 +96,13 @@ func ParseUlimit(val string) (*Ulimit, error) { return nil, fmt.Errorf("too many limit value arguments - %s, can only have up to two, `soft[:hard]`", parts[1]) } - if soft > *hard { - return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard) + if *hard != -1 { + if soft == -1 { + return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: soft: -1 (unlimited), hard: %d", *hard) + } + if soft > *hard { + return nil, fmt.Errorf("ulimit soft limit must be less than or equal to hard limit: %d > %d", soft, *hard) + } } return &Ulimit{Name: parts[0], Soft: soft, Hard: *hard}, nil |