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
Gid creation code moved. NT.
[sfa.git]
/
sfa
/
senslab
/
slab-import.py
diff --git
a/sfa/senslab/slab-import.py
b/sfa/senslab/slab-import.py
index
e41e2ca
..
1cfbda1
100644
(file)
--- a/
sfa/senslab/slab-import.py
+++ b/
sfa/senslab/slab-import.py
@@
-80,10
+80,15
@@
def import_person(person):
existing_records = table.find({'hrn': person['hrn'], 'type': 'user'})
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : person record %s inserted" %(person['hrn'])
existing_records = table.find({'hrn': person['hrn'], 'type': 'user'})
if not existing_records:
print>>sys.stderr, " \r\n \t slab-import : person record %s inserted" %(person['hrn'])
+ uuid=create_uuid()
+ RSA_KEY_STRING=person['pkey']
+ pkey=convert_public_key(RSA_KEY_STRING)
+ person['gid']=self.senslabauth.create_gid("urn:publicid:IDN+"+self.authname+"+user+"+ldapentry[1]['uid'][0], uuid, pkey, CA=False)
table.insert(person)
else:
existing_record = existing_records[0]
person['record_id'] = existing_record['record_id']
table.insert(person)
else:
existing_record = existing_records[0]
person['record_id'] = existing_record['record_id']
+ # handle key change ???
table.update(person)
def import_slice(person):
table.update(person)
def import_slice(person):