--export-upstream=... broken since 2.1.1

[Alexander Sack]

Binary package hint: bzr-builddeb

--export-upstream doesnt work at all anymore here. we use it in combination with .bzr-builddeb/default.conf in various branches.

but even without that meta file i get the error below ... please keep the options working. Thanks!

bzr bd --merge --export-upstream=../flashblock.up/ --builder='debuild -b'
Building using working tree
Running in merge mode
bzr: ERROR: exceptions.AttributeError: 'DebBuildConfig' object has no attribute 'version'

Traceback (most recent call last):
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 716, in exception_to_return_code
    return the_callable(*args, **kwargs)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 911, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.6/dist-packages/bzrlib/commands.py", line 547, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/builddeb/cmds.py", line 367, in run
    export_upstream_revision, config)
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/builddeb/cmds.py", line 324, in _get_upstream_branch
    config.export_upstream_revision
  File "/usr/lib/python2.6/dist-packages/bzrlib/plugins/builddeb/config.py", line 273, in _get_export_upstream_revision
    if self.version is not None:
AttributeError: 'DebBuildConfig' object has no attribute 'version'

bzr 1.13rc1 on python 2.6.1 (linux2)
arguments: ['/usr/bin/bzr', 'bd', '--merge', '--export-upstream=../flashblock.up/', '--builder=debuild -b']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_US.UTF-8'
plugins:
  builddeb /usr/lib/python2.6/dist-packages/bzrlib/plugins/builddeb [unknown]
  bzrtools /usr/lib/python2.6/dist-packages/bzrlib/plugins/bzrtools [1.13]
  launchpad /usr/lib/python2.6/dist-packages/bzrlib/plugins/launchpad [unknown]
  netrc_credential_store /usr/lib/python2.6/dist-packages/bzrlib/plugins/netrc_credential_store [unknown]
  rebase /usr/lib/python2.6/dist-packages/bzrlib/plugins/rebase [0.4.4]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

[Alexander Sack (asac)]

fwiw, in order to build any of our branches I have to downgrade to 2.0.X and python 2.5