Move KEY_LEN to config.

diff --git a/gkeyldap/actions.py b/gkeyldap/actions.py
index 13e67f71cac2f00e6069807fe2e92262b8e710ea..2c65a905b04a8b31caea65a87d9738b964cebb15 100644 (file)
--- a/gkeyldap/actions.py
+++ b/gkeyldap/actions.py
@@ -13,18 +13,11 @@
 import os
 import re
 
-from gkeys.config import GKEY, KEYID, LONGKEYID, FINGERPRINT
+from gkeys.config import GKEY, KEYID, LONGKEYID, FINGERPRINT, KEY_LEN
 from gkeys.seed import Seeds
 from gkeyldap.search import (LdapSearch, UID, gkey2ldap_map, gkey2SEARCH)
 
 
-# set some defaults
-KEY_LEN = {
-    'keyid': 8,
-    'longkeyid': 16,
-}
-
-
 Avialable_Actions = ['ldapsearch', 'updateseeds']
 
 
@@ -187,9 +180,9 @@ class Actions(object):
         keyinfo = []
         keyid_found = False
         keyid_missing = False
-        # assume it's good until found an error is found
+        # assume it's good until an error is found
         is_good = True
-        #self.logger.debug("MAIN: build_gkeylist; info = %s" % str(info))
+        #self.logger.debug("Actions: build_gkeylist; info = %s" % str(info))
         for x in GKEY._fields:
             field = gkey2ldap_map[x]
             if not field:

diff --git a/gkeys/config.py b/gkeys/config.py
index 5fe38710ea5a1c35fbb2b43a65aa3ed8e48c4cfe..6785c7bfde1b126c4267e63c9f847f048edf1aec 100644 (file)
--- a/gkeys/config.py
+++ b/gkeys/config.py
@@ -120,6 +120,12 @@ LONGKEYID = 3
 KEYDIR = 4
 FINGERPRINT = 5
 
+# set some defaults
+KEY_LEN = {
+    'keyid': 8,
+    'longkeyid': 16,
+}
+
 
 class GKEY(namedtuple('GKEY', ['nick', 'name', 'keyid', 'longkeyid',
     'keydir', 'fingerprint'])):