X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Fstorage%2Fmodel.py;h=46e2deed96c0c363b0b76c4d81528231b7576aa9;hb=530da21961ce85b954fdc62a2b2be07fc31a9776;hp=1228290fe64ed2704fb33384280ae8964e85b2b5;hpb=f42832ac5338cb900a7d297cf6cdbe63bace6009;p=sfa.git

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 1228290f..46e2deed 100644
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -228,6 +228,8 @@ class RegSlice (RegRecord):
         self.reg_researchers = researchers
 
     # when dealing with credentials, we need to retrieve the PIs attached to a slice
+    # WARNING: with the move to passing dbsessions around, we face a glitch here because this
+    # helper function is called from the trust/ area that
     def get_pis (self):
         from sqlalchemy.orm import sessionmaker
         Session=sessionmaker()
@@ -371,11 +373,7 @@ class SliverAllocation(Base,AlchemyObj):
             dbsession.delete(sliver_allocation)
         dbsession.commit()
     
-    def sync(self):
-        
-        from sqlalchemy.orm import sessionmaker
-        Session=sessionmaker()
-        dbsession=Session.object_session(self)
+    def sync(self, dbsession):
         constraints = [SliverAllocation.sliver_id==self.sliver_id]
         results = dbsession.query(SliverAllocation).filter(and_(*constraints))
         records = []