export-upstream should not export upstream tarball when a proper orig.tar.gz is available from other sources

[Alexander Sack]

Problem is that --export-upstream doesn't reliably reproduce identical orig.tar.gz (by checksum).

So in worst case you upload -0ubuntu1 with a orig.tar.gz and when you want to do -0ubuntu2, export-upstream will produce a new orig.tar.gz that has a checksum mismatch with what is already in the archive. In consequence upload is rejected.

This becomes particulary annoying when you are using .bzr-builddeb/default.conf in order to commit the right upstream revision directly to the branch. Once you did that you cannot produce a build that can be successfully uploaded. Only workaround for me in that situation was to remove the default.conf entries temporarily.

One pragmatic solution would be to not export-upstream if there already is a proper tarball in the --orig-dir. On top it would even make sense imo to prefer to take a orig.tar.gz from the archive too, if there is a proper version available.

The other way of tackling this, would be to not honour export-upstream in default.conf for "normal" build operations, but only when user explicitly asks for an export (we could use the existing -e parameter?). If we go that way bzr could also give users a hint how to export the orig.tar.gz in case no proper orig.tar.gz can be found and default.conf contains the proper hints export-upstream* hints.

[James Westby (james-w)]

Hi,

I've just committed pristine-tar integration, which will fix this.

However, it had to be done by breaking compatibility. export-upstream
mode no longer works. Instead, you should use "bzr merge-upstream"
to merge in the changes, then build the result.

More details for transitioning on request.

Thanks,

James