Merge lp:~al-maisan/bzr-builddeb/pristine-tar into lp:~bzr-builddeb-hackers/bzr-builddeb/trunk-old

[Muharem Hrnjadovic]

[Muharem Hrnjadovic (al-maisan)]

Hello there!

This branch fixes the following kind of failure (bug #417153):

{{{
$ bzr branch lp:ubuntu/gwibber; cd gwibber; bzr bd -S
Branched 11 revision(s).
Building using working tree
Looking for a way to retrieve the upstream tarball
Using pristine-tar to reconstruct the needed tarball.
tar: gwibber-2.0.0~bzr396/.bzrignore: Cannot stat: No such file or directory
tar: Exiting with failure status due to previous errors
pristine-tar: command failed: tar cf /tmp/pristine-tar.NQspZVOeeE/recreatetarball --owner 0 --group 0 --numeric-owner -C /tmp/pristine-tar.NQspZVOeeE/workdir --no-recursion --mode 0644 --files-from /tmp/pristine-tar.NQspZVOeeE/manifest
bzr: ERROR: There was an error using pristine-tar: Generating tar from delta failed: None.
}}}

The "pristine-tar gentar" failure is now detected and an appropriate exception
(PackageVersionNotPresent) is raised to the caller so it can try to obtain the
required upstream tar ball from the next package source.

There are also two small "drive-by" fixes:

    - format string fix in MissingChangelogError
    - removal of some "dead code" in import_dsc.py

NB: this is only the first part of the "pristine-tar" problem solution. A
forthcoming branch will make sure that the "pristine-tar gendelta" command
does not produce deltas with files missing from the unpacked source tree
(thus "obscuring" future "pristine-tar gentar" problems).

Please have a look and let me know what you think.

[James Westby (james-w)]

Looks good, thanks.

James

review: Approve

=== modified file 'errors.py'
--- errors.py	2009-08-24 16:27:40 +0000
+++ errors.py	2009-09-03 09:35:00 +0000
@@ -66,7 +66,7 @@
 
 
 class MissingChangelogError(BzrError):
-    _fmt = 'Could not find changelog at %(locations)s.'
+    _fmt = 'Could not find changelog at %(location)s.'
 
     def __init__(self, locations):
         BzrError.__init__(self, location=locations)
 
=== modified file 'import_dsc.py'
--- import_dsc.py	2009-08-28 16:49:59 +0000
+++ import_dsc.py	2009-09-03 09:58:24 +0000
@@ -82,14 +82,6 @@
     '.hg', '_darcs', '.git', '.shelf', '.bzr', '.bzr.backup', '.bzrtags',
     '.bzr-builddeb'])
 
-exclude_as_files = ['*/' + x for x in files_to_ignore]
-exclude_as_dirs = ['*/' + x + '/*' for x in files_to_ignore]
-exclude = exclude_as_files + exclude_as_dirs
-underscore_x = ['-x'] * len(exclude)
-ignore_arguments = []
-map(ignore_arguments.extend, zip(underscore_x, exclude))
-ignore_arguments = ignore_arguments + ['-x', '*,v']
-
 
 class DirWrapper(object):
     def __init__(self, fileobj, mode='r'):
 
=== modified file 'upstream.py'
--- upstream.py	2009-08-24 17:33:44 +0000
+++ upstream.py	2009-09-10 08:43:13 +0000
@@ -33,6 +33,7 @@
 from bzrlib.plugins.builddeb.errors import (
     MissingUpstreamTarball,
     PackageVersionNotPresent,
+    PristineTarError,
     )
 from bzrlib.plugins.builddeb.import_dsc import DistributionBranch
 from bzrlib.plugins.builddeb.repack_tarball import repack_tarball
@@ -83,7 +84,10 @@
         if not db.has_pristine_tar_delta(revid):
             raise PackageVersionNotPresent(package, version, self)
         info("Using pristine-tar to reconstruct the needed tarball.")
-        db.reconstruct_pristine_tar(revid, package, version, target_filename)
+        try:
+            db.reconstruct_pristine_tar(revid, package, version, target_filename)
+        except PristineTarError:
+            raise PackageVersionNotPresent(package, version, self)
 
 
 class AptSource(UpstreamSource):