Error in trac-admin env upgrade - AttributeError: 'Environment' object has no attribute 'env'

[piotr@…]

It is now imposible to upgrade trac environment, due to the aforementioned error.

Stack trace is:

2010-02-15 16:11:15,448 Trac[console] ERROR: Exception in trac-admin command:
Traceback (most recent call last):
  File "build/bdist.linux-i686/egg/trac/admin/console.py", line 107, in onecmd
    rv = cmd.Cmd.onecmd(self, line) or 0
  File "/usr/lib/python2.6/cmd.py", line 218, in onecmd
    return self.default(line)
  File "build/bdist.linux-i686/egg/trac/admin/console.py", line 251, in default
    return cmd_mgr.execute_command(*args)
  File "build/bdist.linux-i686/egg/trac/admin/api.py", line 118, in execute_command
    return f(*fargs)
  File "build/bdist.linux-i686/egg/trac/env.py", line 745, in _do_upgrade
    self.env.upgrade(backup=no_backup is None)
  File "build/bdist.linux-i686/egg/trac/env.py", line 491, in upgrade
    @with_transaction(self.env)
AttributeError: 'Environment' object has no attribute 'env'

This was probably introduced with improvement of transaction handling in changeset r9183.

[Christian Boos]

Can you please try the following fix:

trac/env.py

@@ -488 +488 @@
         if backup:
             self.backup(backup_dest)
 
-        @with_transaction(self.env)
+        @with_transaction(self)
         def do_upgrade(db):
             for participant in upgraders:
                 participant.upgrade_environment(db)

(and no need to CC: me, I get notified of all the changes anyway ;-) )

[piotr@…]

The patch that fixes erroneous behavior describe above. (self.env changed to self)