From 919b0c72e75b1211530ce124b5dadf82f6a1eb47 Mon Sep 17 00:00:00 2001 From: Jan Kaluza Date: May 18 2018 10:57:50 +0000 Subject: Respect limit in freshmaker-cli when querying using --name/--rebuilt-nvr/--original-nvr --- diff --git a/contrib/freshmaker-cli b/contrib/freshmaker-cli index 58a740d..58c6bbe 100755 --- a/contrib/freshmaker-cli +++ b/contrib/freshmaker-cli @@ -172,13 +172,16 @@ def _get_freshmaker_items(url, params, limit=None): return ret_items -def get_events_from_builds(api_url, **kwargs): - params = {} +def get_events_from_builds(api_url, limit=None, **kwargs): + params = {"order_by": "-event_id"} for key, value in kwargs.items(): if value: params[key] = value - builds = _get_freshmaker_items("%s/api/1/builds" % api_url, params) - ids = set([build["event_id"] for build in builds]) + builds = _get_freshmaker_items("%s/api/1/builds" % api_url, params, + limit=limit) + # Remove duplicates and sort by event_id. + ids = list(set([build["event_id"] for build in builds])) + ids.sort() return get_freshmaker_events_by_ids(api_url, ids) @@ -188,7 +191,7 @@ def get_freshmaker_events(api_url, search_key=None, rebuilt_nvr=None, if rebuilt_nvr or original_nvr or name: return get_events_from_builds( api_url, rebuilt_nvr=rebuilt_nvr, original_nvr=original_nvr, - name=name) + name=name, limit=limit) params = {} if states: