From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 15 Oct 2013 10:05:10 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.onelab.eu/git/sfa
X-Git-Tag: geni-v2-broken-and-discontinued~37
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=0e92aab63fd6e2ab1d9106332b1cf5db1c39eea1;hp=4f1cf458df84f1742962ab7a8fab801ec471d92c;p=sfa.git

Merge branch 'master' of ssh://git.onelab.eu/git/sfa
---

diff --git a/sfa/client/sfaadmin.py b/sfa/client/sfaadmin.py
index 9dd40f87..94ba8812 100755
--- a/sfa/client/sfaadmin.py
+++ b/sfa/client/sfaadmin.py
@@ -261,7 +261,7 @@ Users having a GID/PubKey correpondence NOT OK: %s and are: \n%s\n\n"%(len(NOKEY
         """Initialize or upgrade the db"""
         from sfa.storage.dbschema import DBSchema
         dbschema=DBSchema()
-        dbschema.init_or_upgrade
+        dbschema.init_or_upgrade()
     
     @args('-a', '--all', dest='all', metavar='<all>', action='store_true', default=False,
           help='Remove all registry records and all files in %s area' % help_basedir)
diff --git a/sfa/importer/plimporter.py b/sfa/importer/plimporter.py
index 26d1ccdc..41325a89 100644
--- a/sfa/importer/plimporter.py
+++ b/sfa/importer/plimporter.py
@@ -376,7 +376,7 @@ class PlImporter:
             # being improperly handled, and where the whole loop on persons
             # could be performed twice with the same person...
             # so hopefully we do not need to eliminate duplicates explicitly here anymore
-            site_record.reg_pis = site_pis
+            site_record.reg_pis = list(set(site_pis))
             dbsession.commit()
 
             # import slices