Upgrade: Get back the checks before calling upgrade

Also did some cleanups to remove unnecessary code and polished code.
dwaynebailey · Apr 23, 2014 · d634d6d · d634d6d
1 parent 001c0cb
commit d634d6d
Showing 1 changed file with 6 additions and 7 deletions.
diff --git a/pootle/apps/pootle_app/management/commands/upgrade.py b/pootle/apps/pootle_app/management/commands/upgrade.py
@@ -114,26 +114,25 @@ def handle(self, *args, **options):
         tt_changed = db_tt_buildversion < CODE_TTK_BUILDVERSION
 
         if ptl_changed or tt_changed:
+            from pootle_misc.upgrade import upgrade
 
             if ptl_changed:
                 logging.info('Detected new Pootle version: %d.',
                              CODE_PTL_BUILDVERSION)
-            else:
-                db_ptl_buildversion = 0
 
             if tt_changed:
                 logging.info('Detected new Translate Toolkit version: %d.',
                              CODE_TTK_BUILDVERSION)
-            else:
-                db_tt_buildversion = 0
 
             logging.info('Running the upgrade machinery...')
 
-            from pootle_misc.upgrade import upgrade
+            if ptl_changed:
+                upgrade('pootle', db_ptl_buildversion, CODE_PTL_BUILDVERSION)
 
-            upgrade('pootle', db_ptl_buildversion, CODE_PTL_BUILDVERSION)
-            upgrade('ttk', db_tt_buildversion, CODE_TTK_BUILDVERSION)
+            if tt_changed:
+                upgrade('ttk', db_tt_buildversion, CODE_TTK_BUILDVERSION)
 
+            # Perform the option related actions.
             if options['calculate_stats']:
                 calculate_stats()