| 1 |
commit: 423c3bf0b3ae993e15886858aede0a94372b55fd |
| 2 |
Author: aeroniero33 <justthisthing <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri May 27 13:28:38 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Jun 1 15:14:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/gentoo-keys.git/commit/?id=423c3bf0 |
| 7 |
|
| 8 |
Fixed move-seed function |
| 9 |
|
| 10 |
gkeys/gkeys/action_map.py | 4 +--- |
| 11 |
gkeys/gkeys/actions.py | 4 ++-- |
| 12 |
gkeys/gkeys/seedhandler.py | 3 ++- |
| 13 |
3 files changed, 5 insertions(+), 6 deletions(-) |
| 14 |
|
| 15 |
diff --git a/gkeys/gkeys/action_map.py b/gkeys/gkeys/action_map.py |
| 16 |
index d7eac63..80c59fe 100644 |
| 17 |
--- a/gkeys/gkeys/action_map.py |
| 18 |
+++ b/gkeys/gkeys/action_map.py |
| 19 |
@@ -15,7 +15,7 @@ from collections import OrderedDict |
| 20 |
|
| 21 |
|
| 22 |
Seed_Actions = ['----seeds----', 'add-seed', 'fetch-seed', |
| 23 |
- 'list-seed', 'list-seedfiles', 'remove-seed'] |
| 24 |
+ 'list-seed', 'list-seedfiles', 'move-seed', 'remove-seed'] |
| 25 |
|
| 26 |
Key_Actions = ['----keys-----', 'check-key', 'installed', |
| 27 |
'install-key', 'list-key', 'refresh-key', 'remove-key', |
| 28 |
@@ -430,5 +430,3 @@ Found Failures: |
| 29 |
''', |
| 30 |
}), |
| 31 |
]) |
| 32 |
- |
| 33 |
- |
| 34 |
|
| 35 |
diff --git a/gkeys/gkeys/actions.py b/gkeys/gkeys/actions.py |
| 36 |
index ef8a30e..1b27605 100644 |
| 37 |
--- a/gkeys/gkeys/actions.py |
| 38 |
+++ b/gkeys/gkeys/actions.py |
| 39 |
@@ -153,10 +153,10 @@ class Actions(ActionBase): |
| 40 |
self.logger.debug(_unicode("ACTIONS: moveseed; gkey: %s") |
| 41 |
% _unicode(searchkey)) |
| 42 |
if not self.seeds: |
| 43 |
- self.seeds = self.load_seeds(args.category) |
| 44 |
+ self.seeds = self.seedhandler.load_seeds(args.category) |
| 45 |
kwargs = self.seedhandler.build_gkeydict(args) |
| 46 |
sourcekeys = self.seeds.list(**kwargs) |
| 47 |
- dest = self.load_seeds(args.destination) |
| 48 |
+ dest = self.seedhandler.load_seeds(args.destination) |
| 49 |
destkeys = dest.list(**kwargs) |
| 50 |
messages = [] |
| 51 |
if len(sourcekeys) == 1 and destkeys == []: |
| 52 |
|
| 53 |
diff --git a/gkeys/gkeys/seedhandler.py b/gkeys/gkeys/seedhandler.py |
| 54 |
index 248b7b6..de2a6ad 100644 |
| 55 |
--- a/gkeys/gkeys/seedhandler.py |
| 56 |
+++ b/gkeys/gkeys/seedhandler.py |
| 57 |
@@ -67,7 +67,8 @@ class SeedHandler(object): |
| 58 |
else: |
| 59 |
keyinfo[attr] = value |
| 60 |
except AttributeError: |
| 61 |
- pass |
| 62 |
+ if attr in GKEY._fields: |
| 63 |
+ keyinfo[attr] = None |
| 64 |
return keyinfo |
| 65 |
|
| 66 |
def load_seeds(self, seedfile=None, filepath=None, refresh=False): |
Archives