Auto upload crashes - NameError: global name 'trace' is not defined

[Gary van der Merwe]

With the latest bzr-upload, I get this error committing to a branch with a auto upload set.

Run command: bzr commit -m "CSS Style for previous commit." style/july2004.css
Committing to: ftp://ftpps@216.236.176.58/PresentationSkills/
modified style/july2004.css
bzr: ERROR: exceptions.NameError: global name 'trace' is not defined

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 907, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1111, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 685, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 700, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/commands.py", line 763, in run
    return run_subprocess_command(cmd, bencoded)
  File "/home/garyvdm/.bazaar/plugins/qbzr/lib/subprocess.py", line 863, in run_subprocess_command
    return commands.run_bzr(argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 1111, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 685, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 700, in run
    return self._operation.run_simple(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 122, in run_simple
    self.cleanups, self.func, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/builtins.py", line 3190, in run
    exclude=safe_relpath_files(tree, exclude))
  File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/workingtree_4.py", line 197, in commit
    result = WorkingTree3.commit(self, message, revprops, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/mutabletree.py", line 225, in commit
    *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 264, in commit
    possible_master_transports=possible_master_transports)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 118, in run
    self.cleanups, self.func, self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/cleanup.py", line 156, in _do_with_cleanups
    result = func(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commit.py", line 426, in _commit
    self.branch.repository, new_revno, self.rev_id)
  File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 971, in import_last_revision_info
    self.set_last_revision_info(revno, revid)
  File "/usr/lib/python2.6/dist-packages/bzrlib/decorators.py", line 194, in write_locked
    result = unbound(self, *args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 2596, in set_last_revision_info
    self._run_post_change_branch_tip_hooks(old_revno, old_revid)
  File "/usr/lib/python2.6/dist-packages/bzrlib/branch.py", line 1142, in _run_post_change_branch_tip_hooks
    hook(params)
  File "/home/garyvdm/.bazaar/plugins/upload/__init__.py", line 711, in auto_upload_hook
    trace.note('Automatically uploading to %s', display_url)
NameError: global name 'trace' is not defined

Reverting to rev 71 fixes the problem.

[Vincent Ladeuil (vila)]

Thanks for the report, sorry for that, fixe in trunk (revno 73).