[Pkg-bazaar-maint] Bug#449369: bzr-builddeb: merge-upstream --version is a conflicting optoin

[Jamie Wilkinson]

Package: bzr-builddeb
Version: 0.90
Severity: normal

Hi!

Following the instructions in the documentation, I try to run
merge-upstream with --version, and get the following traceback:
(actually with any invocation of merge-upstream):

dawn% bzr merge-upstream --version 
bzr: ERROR: optparse.OptionConflictError: option -v/--version: conflicting option string(s): -v

Traceback (most recent call last):
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 800, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 758, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 465, in run_argv_aliases
    args, opts = parse_args(self, argv, alias_argv)
  File "/usr/lib/python2.4/site-packages/bzrlib/commands.py", line 538, in parse_args
    parser = option.get_optparser(command.options())
  File "/usr/lib/python2.4/site-packages/bzrlib/option.py", line 409, in get_optparser
    option.add_option(parser, option.short_name())
  File "/usr/lib/python2.4/site-packages/bzrlib/option.py", line 228, in add_option
    default=OptionParser.DEFAULT_VALUE,
  File "optparse.py", line 941, in add_option
    self._check_conflict(option)
  File "optparse.py", line 916, in _check_conflict
    option)
OptionConflictError: option -v/--version: conflicting option string(s): -v

bzr 0.91.0 on python 2.4.4.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge-upstream', '--help']

** please send this report to bazaar at lists.ubuntu.com


-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)

Kernel: Linux 2.6.22-2-686 (SMP w/1 CPU core)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr-builddeb depends on:
ii  bzr                           0.91-2     Bazaar, the next-generation distri
ii  bzrtools                      0.91.0-1   Collection of tools for bzr
ii  devscripts                    2.10.10    Scripts to make the life of a Debi
ii  dpkg-dev                      1.14.7     package building tools for Debian
ii  fakeroot                      1.8.4      Gives a fake root environment
ii  patchutils                    0.2.31-4   Utilities to work with patches
ii  python                        2.4.4-6    An interactive high-level object-o
ii  python-central                0.5.15     register and build utility for Pyt
ii  python-debian                 0.1.6      python modules to work with Debian

bzr-builddeb recommends no packages.

-- no debconf information