[Pkg-bazaar-maint] Bug#470006: bzr: diff --diff-options argument ignored

[Sjoerd Simons]

Package: bzr
Version: 1.2~rc1-1
Severity: normal


According documentation the argument --diff-options should be passed to the
external diff program, but they aren't. As shown by the strace output below

$ strace -f -eexecve bzr diff --using /usr/bin/diff --diff-options -wu
execve("/usr/bin/bzr", ["bzr", "diff", "--using", "/usr/bin/diff",
"--diff-options", "-wu"], [/* 47 vars */]) = 0
=== modified file 'changelog'
Process 8938 attached (waiting for parent)
Process 8938 resumed (parent 8937 ready)
[pid  8938] execve("/usr/bin/diff", ["/usr/bin/diff", "old/changelog",
"new/changelog"], [/* 47 vars */]) = 0


This breaks debcommit when used on a bzr repository :(

-- System Information:
Debian Release: lenny/sid
  APT prefers unstable
  APT policy: (500, 'unstable'), (500, 'testing'), (1, 'experimental')
Architecture: amd64 (x86_64)

Kernel: Linux 2.6.24-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=C, LC_CTYPE=nl_NL (charmap=ISO-8859-1)
Shell: /bin/sh linked to /bin/bash

Versions of packages bzr depends on:
ii  libc6                         2.7-9      GNU C Library: Shared libraries
ii  python                        2.4.4-6    An interactive high-level object-o
ii  python-celementtree           1.0.5-9    Light-weight toolkit for XML proce
ii  python-central                0.5.15-0.1 register and build utility for Pyt

Versions of packages bzr recommends:
ii  bzrtools                      1.2.0-1    Collection of tools for bzr
ii  python-paramiko               1.7.2-0.1  make SSH2 connections with python

-- no debconf information