merge-upstream: more helpful error message if pristine-tar does not exist

[Daniel Hahler]

I'm trying to merge a new upstream revision, which fails as follows:

$ bzr merge-upstream ../tvbrowser_2.7.3.orig.tar.gz --version 2.7.3
Using distribution jaunty
/usr/bin/pristine-tar gendelta /home/daniel/ubuntu/tvbrowser/tvbrowser_2.7.3.orig.tar.gz -
bzr: ERROR: [Errno 2] No such file or directory

The problem appears to be that I've not installed pristine-tar - maybe that should get checked at the beginning of running merge-upstream (and output a more helpful error)?

[James Westby (james-w)]

On Sun, 2009-03-01 at 22:37 +0000, Daniel Hahler wrote:
> Public bug reported:
>
> I'm trying to merge a new upstream revision, which fails as follows:
>
> $ bzr merge-upstream ../tvbrowser_2.7.3.orig.tar.gz --version 2.7.3
> Using distribution jaunty
> /usr/bin/pristine-tar gendelta /home/daniel/ubuntu/tvbrowser/tvbrowser_2.7.3.orig.tar.gz -
> bzr: ERROR: [Errno 2] No such file or directory
>
> The problem appears to be that I've not installed pristine-tar - maybe
> that should get checked at the beginning of running merge-upstream (and
> output a more helpful error)?

Thanks for the report,

I thought I had made pristine-tar a dependency, I at least intended to.

I will fix this in the next upload.

Thanks,

James

[Daniel Hahler (blueyed)]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

James Westby schrieb:

> I thought I had made pristine-tar a dependency, I at least intended to.
>
> I will fix this in the next upload.

It is a dependency in the Ubuntu package, yes. But I'm using a checkout
in ~/.bazaar/plugins (while not having the package installed through the
package manager).

I'm not sure, if it should really do a manual check in the program
itself, but I was very confused then the error occurred - it was unclear
to me that it was a missing pristine-tar.

- --
http://daniel.hahler.de/
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFJqyPtfAK/hT/mPgARAgXAAJ42b46HesG+zao4R0oPkqhrhk/sRQCgu9Ym
t2b0MjhKfxWeJ5d1Lstvr0g=
=tVPQ
-----END PGP SIGNATURE-----