git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
minor cleanup
[sfa.git]
/
sfa
/
importer
/
sfaImport.py
diff --git
a/sfa/importer/sfaImport.py
b/sfa/importer/sfaImport.py
index
74f1042
..
ca0bff2
100644
(file)
--- a/
sfa/importer/sfaImport.py
+++ b/
sfa/importer/sfaImport.py
@@
-18,7
+18,6
@@
from sfa.trust.hierarchy import Hierarchy
from sfa.trust.gid import create_uuid
from sfa.storage.table import SfaTable
from sfa.storage.record import SfaRecord
from sfa.trust.gid import create_uuid
from sfa.storage.table import SfaTable
from sfa.storage.record import SfaRecord
-from sfa.storage.table import SfaTable
def _un_unicode(str):
def _un_unicode(str):
@@
-50,7
+49,7
@@
class sfaImport:
def __init__(self):
self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
self.AuthHierarchy = Hierarchy()
def __init__(self):
self.logger = _SfaLogger(logfile='/var/log/sfa_import.log', loggername='importlog')
self.AuthHierarchy = Hierarchy()
- self.table = SfaTable()
+
#
self.table = SfaTable()
self.config = Config()
self.TrustedRoots = TrustedRoots(Config.get_trustedroots_dir(self.config))
self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH
self.config = Config()
self.TrustedRoots = TrustedRoots(Config.get_trustedroots_dir(self.config))
self.root_auth = self.config.SFA_REGISTRY_ROOT_AUTH