From cf602e151ad96f703d9f595f7b9a99b87fe52314 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 5 Jun 2012 17:59:44 +0200 Subject: [PATCH] undo previous tentative bugfix about importing existing records with a auchange in their hrn we need another approach entirely, when a hrn changes the gid needs to be recomputed anyway --- sfa/importer/plimporter.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py index f6ecc45c..9fe43165 100644 --- a/sfa/importer/plimporter.py +++ b/sfa/importer/plimporter.py @@ -180,11 +180,6 @@ class PlImporter: # isolate special vini case in separate method self.create_special_vini_record (interface_hrn) - def check_hrn (record, hrn): - if record.hrn != hrn: - record.hrn=hrn - dbsession.commit() - # start importing for site in sites: site_hrn = _get_site_hrn(interface_hrn, site) @@ -211,8 +206,6 @@ class PlImporter: self.logger.log_exc("PlImporter: failed to import site. Skipping child records") continue else: - # we might have renamed it - since we first use pointer to locate it - check_hrn(site_record, site_hrn) # xxx update the record ... pass site_record.stale=False @@ -247,7 +240,7 @@ class PlImporter: self.logger.log_exc("PlImporter: failed to import node") else: # xxx update the record ... - check_hrn(node_record, node_hrn) + pass node_record.stale=False site_pis=[] @@ -305,7 +298,6 @@ class PlImporter: # update the record ? # if user's primary key has changed then we need to update the # users gid by forcing an update here - check_hrn (user_record, person_hrn) sfa_keys = user_record.reg_keys def key_in_list (key,sfa_keys): for reg_key in sfa_keys: @@ -363,7 +355,6 @@ class PlImporter: self.logger.log_exc("PlImporter: failed to import slice") else: # xxx update the record ... - check_hrn (slice_record, slice_hrn) self.logger.warning ("Slice update not yet implemented") pass # record current users affiliated with the slice -- 2.47.0