Ticket #7082: trac-env-auto-upgrade.diff

trac/trac/env.py

@@ -566 +566 @@
         except Exception, e: # e.g. no database connection
             env.log.exception(e)
         if needs_upgrade:
-            raise TracError(_('The Trac Environment needs to be upgraded.\n\n'
-                              'Run "trac-admin %(path)s upgrade"',
-                              path=env_path))
+            if env.config.getbool('trac','auto_upgrade',False):
+                try:
+                    env.log.info('Attempting auto-upgrade for %s' % env_path)
+                    env.upgrade()
+                    needs_upgrade = env.needs_upgrade()
+                    env.log.info('Successful auto-upgrade for %s' % env_path)
+                except Exception, e: # e.g. no database connection
+                    env.log.error('Failed auto-upgrade for %s: %s' % 
+                                                            (env_path,e))
+            if needs_upgrade:
+                raise TracError(_('The Trac Environment needs to be upgraded.'
+                                  '\n\nRun "trac-admin %(path)s upgrade"',
+                                  path=env_path))
 
     return env