diff options
author | Qi Wang <qiwan@redhat.com> | 2019-08-01 15:35:26 -0400 |
---|---|---|
committer | Qi Wang <qiwan@redhat.com> | 2019-08-01 16:15:15 -0400 |
commit | 619a39f7bb2275a086651fcf31619959f6d15c6b (patch) | |
tree | 095cfbdab8e08b7c2258cd358d832627565a99e8 /libpod | |
parent | a622f8d345b1853401de2e533e9fbf14ef169fa2 (diff) | |
download | podman-619a39f7bb2275a086651fcf31619959f6d15c6b.tar.gz podman-619a39f7bb2275a086651fcf31619959f6d15c6b.tar.bz2 podman-619a39f7bb2275a086651fcf31619959f6d15c6b.zip |
fix search output limit
close https://bugzilla.redhat.com/show_bug.cgi?id=1732280
From the bug Podman search returns 25 results even when limit option `--limit` is larger than 25(maxQueries). They want Podman to return `--limit` results.
This PR fixes the number of output result.
if --limit not set, return MIN(maxQueries, len(res))
if --limit is set, return MIN(option, len(res))
Signed-off-by: Qi Wang <qiwan@redhat.com>
Diffstat (limited to 'libpod')
-rw-r--r-- | libpod/image/search.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/libpod/image/search.go b/libpod/image/search.go index e557431c6..82ef4f75a 100644 --- a/libpod/image/search.go +++ b/libpod/image/search.go @@ -162,8 +162,11 @@ func searchImageInRegistry(term string, registry string, options SearchOptions) if len(results) < limit { limit = len(results) } - if options.Limit != 0 && options.Limit < len(results) { - limit = options.Limit + if options.Limit != 0 { + limit = len(results) + if options.Limit < len(results) { + limit = options.Limit + } } paramsArr := []SearchResult{} |