Merge lp://staging/~maxb/bzr-builddeb/better-error-multiple-upstream-tarballs into lp://staging/bzr-builddeb

On Thu, 2011-06-09 at 21:46 +0000, Max Bowsher wrote:
> Max Bowsher has proposed merging lp:~maxb/bzr-builddeb/better-error-multiple-upstream-tarballs into lp:bzr-builddeb.
>
> Requested reviews:
> Bzr-builddeb-hackers (bzr-builddeb-hackers)
>
> For more details, see:
> https://code.launchpad.net/~maxb/bzr-builddeb/better-error-multiple-upstream-tarballs/+merge/64090
>
> When attempting to import a package with multiple upstream tarballs, raise
> MultipleUpstreamTarballsNotSupported rather than AssertionError.
>
> The primary motivation is so that the UDD failures categorization will automatically split this case from other kinds of unpack failure.
It would be nice to have a test that verifies that the exception is
raised when there are multiple upstream tarballs.

Other than that, looks good:

  review needsfixing
  merge approve

Cheers,

Jelmer

Alright, I guess the work writing the test will pay off once we actually implement support.

How's this?

Thanks :)

That last bit seems shorter as:

self.addCleanup(extractor.cleanup)
self.assertRaises(MultipleUpstreamTarballsNotSupported, extractor.extract)

rather than:

+ try:
124 + try:
125 + extractor.extract()
126 + self.fail("Expected exception not thrown")
127 + except MultipleUpstreamTarballsNotSupported:
128 + pass # Expected
129 + finally:
130 + extractor.cleanup()