modules/fm-orchestrator
1
0
Fork 0
mirror of https://pagure.io/fm-orchestrator.git synced 2026-02-14 02:25:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move error handling up.

Browse Source 
We need to check for the error here *before* we make a second request
for the "last page".  If we don't, we can end up submitting a query
asking for "page 0" which fails without a helpful message.
This commit is contained in:
Ralph Bean
2017-09-15 16:38:29 -04:00
parent 72d1c83735
commit 7bb88621d1
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
module_build_service/pdc.py
View File

@@ -187,11 +187,6 @@ def get_module(session, module_info, strict=False):
#query['ordering'] = '-variant_release'
retval = session['unreleasedvariants/'](page_size=1, **query)
# Jump to last page to latest module release.
if retval['count'] != 1:
query['page'] = retval['count']
retval = session['unreleasedvariants/'](page_size=1, **query)
# Error handling
if not retval or len(retval["results"]) == 0:
if strict:
@@ -199,6 +194,11 @@ def get_module(session, module_info, strict=False):
else:
return None
# Jump to last page to latest module release.
if retval['count'] != 1:
query['page'] = retval['count']
retval = session['unreleasedvariants/'](page_size=1, **query)
results = retval["results"]
assert len(results) <= 1, pprint.pformat(retval)
return results[0]