aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2015-01-04 22:37:31 -0800
committerBrian Dolbec <dolsen@gentoo.org>2015-01-05 14:21:53 -0800
commit37bdded9136d9417baaa89409ca1f606411932c6 (patch)
tree99f1cd03ac2fa8322bf7a2b372a2ed09d8187aba /gkeys/gkeys/seed.py
parentRemove GKEYS_CONF from command line (diff)
downloadgentoo-keys-37bdded9136d9417baaa89409ca1f606411932c6.tar.gz
gentoo-keys-37bdded9136d9417baaa89409ca1f606411932c6.tar.bz2
gentoo-keys-37bdded9136d9417baaa89409ca1f606411932c6.zip
gkeys/seed.py: Fix logic errors in _seeds2json
The original code did not correctly handle a mix of dictionary and GKEY values.
Diffstat (limited to 'gkeys/gkeys/seed.py')
-rw-r--r--gkeys/gkeys/seed.py5
1 files changed, 1 insertions, 4 deletions
diff --git a/gkeys/gkeys/seed.py b/gkeys/gkeys/seed.py
index a84003d..40bdd46 100644
--- a/gkeys/gkeys/seed.py
+++ b/gkeys/gkeys/seed.py
@@ -229,13 +229,10 @@ class Seeds(object):
def _seeds2json(self, seeds):
- is_gkey = False
if not seeds:
seeds = {}
- elif isinstance(list(seeds.values())[0], GKEY):
- is_gkey = True
for dev, value in list(seeds.items()):
- if is_gkey:
+ if isinstance(value, GKEY):
seeds[dev] = dict(value._asdict())
return json.dumps(seeds, sort_keys=True, indent=4)