From 3daa2349ae2884b60ddca97e2770b99f1e0d7e7d Mon Sep 17 00:00:00 2001 From: Paul Eggleton Date: Wed, 4 Sep 2019 10:51:51 +1200 Subject: [PATCH] update_classic_status: tweak single-object queries .first() returns None if the query is empty, so we can simplify this. Signed-off-by: Paul Eggleton --- layerindex/tools/update_classic_status.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/layerindex/tools/update_classic_status.py b/layerindex/tools/update_classic_status.py index 4f884f1..898d038 100755 --- a/layerindex/tools/update_classic_status.py +++ b/layerindex/tools/update_classic_status.py @@ -59,10 +59,8 @@ def main(): logger.setLevel(options.loglevel) - res = list(LayerItem.objects.filter(name=options.layer)[:1]) - if res: - layer = res[0] - else: + layer = LayerItem.objects.filter(name=options.layer).first() + if not layer: logger.error('Specified layer %s does not exist in database' % options.layer) sys.exit(1) @@ -73,11 +71,10 @@ def main(): updateobj = None if options.update: - updateobj = Update.objects.filter(id=int(options.update)) + updateobj = Update.objects.filter(id=int(options.update)).first() if not updateobj: logger.error("Specified update id %s does not exist in database" % options.update) sys.exit(1) - updateobj = updateobj.first() if options.skip: skiplist = options.skip.split(',')