From f979e948e467bad6fdf5bb8ae13ff61239ab2645 Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sun, 23 Oct 2016 22:45:59 -0700 Subject: [PATCH] Actions.checkkey: fix success returncode The failed dictionary contains lists for each type of failure, so return success if all of those lists are emtpy. --- gkeys/gkeys/actions.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index 1b27605..d51fb3f 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -13,6 +13,7 @@ from __future__ import print_function +import itertools import os import sys @@ -360,7 +361,7 @@ def checkkey(self, args): self.output([failed['invalid']], '\n Invalid keys:\n') if failed['sign']: self.output([failed['sign']], '\n No signing capable subkeys:\n') - return (len(failed) <1, + return (not any(itertools.chain.from_iterable(failed.values())), ['\nFound:\n-------', 'Expired: %d' % len(failed['expired']), 'Revoked: %d' % len(failed['revoked']), 'Invalid: %d' % len(failed['invalid']),