# diff env.py env.py.ori
76c76
<     def environment_needs_upgrade():
---
>     def environment_needs_upgrade(db):
84c84
<     def upgrade_environment():
---
>     def upgrade_environment(db):
791,794c791,795
<             if participant.environment_needs_upgrade():
<                 self.log.warn("Component %s requires environment upgrade",
<                               participant)
<                 return True
---
>             with self.db_query as db:
>                 if participant.environment_needs_upgrade(db):
>                     self.log.warn("Component %s requires environment upgrade",
>                                   participant)
>                     return True
804c805,810
<         if len(self.setup_participants) == 0:
---
>         upgraders = []
>         for participant in self.setup_participants:
>             with self.db_query as db:
>                 if participant.environment_needs_upgrade(db):
>                     upgraders.append(participant)
>         if not upgraders:
813c819
<         for participant in self.setup_participants:
---
>         for participant in upgraders:
816c822,823
<             participant.upgrade_environment()
---
>             with self.db_transaction as db:
>                 participant.upgrade_environment(db)