source/include-binaries with modified binary files can't unpack modified files

[Monty Taylor]

When using bzr bd on a tree that's being managed with import-dsc and merge-upstream, and diffs to a binary file which is listed in debian/source/include-binaries, it seems that the include-binaries file is not winding up in the tree when built with pdebuild. It does work with debuild.

To see in action:

Grab lp:~drizzle-developers/pkg-drizzle/trunk at rev <email address hidden>

Run:
 bzr bd --builder='pdebuild' (having an appropriate pbuilder chroot configured of course)

You should see a test failure in information_schema, which is the result of the changes since the last merge-upstream to tests/r/information_schema.result not being present in the build tree.

As a control case, run bzr bd --builder='debuild' and see that it works fine.

[James Westby (james-w)]

Hi,

At the point that pdebuild is invoked that file is in the tree that it is invoked in.

I think this may depend on a pbuilder config setting. Could you provide a log
of it failing for you?

Which release are you building for when you get this behaviour? Do you have
USE_PDEBUILD_INTERNAL set in your pbuilder config?

Thanks,

James

[Monty Taylor (mordred)]

Here's the last time it failed for me.

http://hudson.drizzle.org/job/drizzle-build-debian-packaging/904/consoleFull

Is there a better or more detailed log I can produce for you?

In this case, I'm building for sid. I don't believe I have a pbuilder
config - I just did a straight-up pbuilder --create --distribution sid

I have these in my devscripts:

DEBUILD_DPKG_BUILDPACKAGE_OPTS="-i -rfakeroot -ICVS -I.svn -I.bzr -ISCCS"

I'm happy to do whatever would be helpful in tracking this down ... I'd
love for my automated package testing to be able to use pbuilder ...

Thanks!
Monty

On 08/25/2010 11:21 AM, James Westby wrote:
> Hi,
>
> At the point that pdebuild is invoked that file is in the tree that it
> is invoked in.
>
> I think this may depend on a pbuilder config setting. Could you provide a log
> of it failing for you?
>
> Which release are you building for when you get this behaviour? Do you have
> USE_PDEBUILD_INTERNAL set in your pbuilder config?
>
> Thanks,
>
> James
>

[James Westby (james-w)]

You sir win one dpkg bug. Thanks for playing, better luck next time.

I'm at a loss to suggest a workaround except for putting the changed file
in debian/ and then copying it over the top of the original in debian/rules
at build time.

Thanks,

James

[James Westby (james-w)]

Confirmed upstream and fixed in git.

Thanks,

James