Merge branch 'master' into sqlalchemy

Conflicts:
	sfa/importer/sfa-import-plc.py

diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index 2431099..153104b 100644 (file)
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -276,6 +276,7 @@ class PlImporter:
                     if not user_record:
                         (pubkey,pkey) = init_person_key (person, plc_keys )
                         person_gid = self.auth_hierarchy.create_gid(person_urn, create_uuid(), pkey)
+                        person_gid.set_email(person['email'])
                         user_record = RegUser (hrn=person_hrn, gid=person_gid, 
                                                  pointer=person['person_id'], 
                                                  authority=get_authority(person_hrn),