diff options
| -rw-r--r-- | gkeys/gkeys/action_map.py | 4 | ||||
| -rw-r--r-- | gkeys/gkeys/actions.py | 4 | ||||
| -rw-r--r-- | gkeys/gkeys/seedhandler.py | 3 |
3 files changed, 5 insertions, 6 deletions
diff --git a/gkeys/gkeys/action_map.py b/gkeys/gkeys/action_map.py index d7eac63..80c59fe 100644 --- a/gkeys/gkeys/action_map.py +++ b/gkeys/gkeys/action_map.py @@ -15,7 +15,7 @@ from collections import OrderedDict Seed_Actions = ['----seeds----', 'add-seed', 'fetch-seed', - 'list-seed', 'list-seedfiles', 'remove-seed'] + 'list-seed', 'list-seedfiles', 'move-seed', 'remove-seed'] Key_Actions = ['----keys-----', 'check-key', 'installed', 'install-key', 'list-key', 'refresh-key', 'remove-key', @@ -430,5 +430,3 @@ Found Failures: ''', }), ]) - - diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py index ef8a30e..1b27605 100644 --- a/gkeys/gkeys/actions.py +++ b/gkeys/gkeys/actions.py @@ -153,10 +153,10 @@ class Actions(ActionBase): self.logger.debug(_unicode("ACTIONS: moveseed; gkey: %s") % _unicode(searchkey)) if not self.seeds: - self.seeds = self.load_seeds(args.category) + self.seeds = self.seedhandler.load_seeds(args.category) kwargs = self.seedhandler.build_gkeydict(args) sourcekeys = self.seeds.list(**kwargs) - dest = self.load_seeds(args.destination) + dest = self.seedhandler.load_seeds(args.destination) destkeys = dest.list(**kwargs) messages = [] if len(sourcekeys) == 1 and destkeys == []: diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py index 248b7b6..de2a6ad 100644 --- a/gkeys/gkeys/seedhandler.py +++ b/gkeys/gkeys/seedhandler.py @@ -67,7 +67,8 @@ class SeedHandler(object): else: keyinfo[attr] = value except AttributeError: - pass + if attr in GKEY._fields: + keyinfo[attr] = None return keyinfo def load_seeds(self, seedfile=None, filepath=None, refresh=False): |