updates

komrade/backend/keymaker.py

@@ -407,13 +407,6 @@ class Keymaker(Logger):
         if 'pubkey' in keys_to_save or 'privkey' in keys_to_save or 'adminkey' in keys_to_save:
             raise KomradeException('there is no private property in a socialist network! all keys must be split between komrades')
 
-        keychain_toreturn = {}
-        for key in keys_to_return:
-            if key in keychain:
-                print('adding',key,'to returned keychain')
-                keychain_toreturn[key]=keychain[key]
-        
-        
         ### SAVE ENCRYPTED KEYS?
         if 'pubkey_encr' in keys_to_save:
             self.crypt_keys.set(name,keychain['pubkey_encr'],prefix='/pubkey_encr/')
@@ -460,6 +453,15 @@ class Keymaker(Logger):
 
 
                 
+        keychain_toreturn = {}
+        for key in keys_to_return:
+            if key in keychain:
+                print('adding',key,'to returned keychain')
+                keychain_toreturn[key]=keychain[key]
+
+        return keychain_toreturn
+
+
         
     @property
     def cell_dblencr(self):