launchpad-reviewers team mailing list archive

[Colin Watson <mp+426668@xxxxxxxxxxxxxxxxxx>]

Colin Watson has proposed merging ~cjwatson/launchpad:db-fix-upgrade-separate-sessions into launchpad:db-devel.

Commit message:
Fix full-update.py to handle recent changes to upgrade.py

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/426668

There's another option now for which we need to pass a value.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:db-fix-upgrade-separate-sessions into launchpad:db-devel.

diff --git a/database/schema/full-update.py b/database/schema/full-update.py
index 6ed32a2..b2d2258 100755
--- a/database/schema/full-update.py
+++ b/database/schema/full-update.py
@@ -41,6 +41,7 @@ def run_upgrade(options, log, primary_con):
     options.commit = False
     options.partial = False
     options.comments = False  # Saves about 1s. Apply comments manually.
+    options.separate_sessions = False
     # Invoke the database schema upgrade process.
     try:
         return upgrade.main(primary_con)