From 7bb88621d1990fac01bc37809b941430a838dcee Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 15 Sep 2017 16:38:29 -0400 Subject: [PATCH] Move error handling up. 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. --- module_build_service/pdc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/module_build_service/pdc.py b/module_build_service/pdc.py index 4c9fc5d8..c1668fcf 100644 --- a/module_build_service/pdc.py +++ b/module_build_service/pdc.py @@ -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]