~ubuntu-branches/debian/sid/bzr-builddeb/sid

« back to all changes in this revision

Viewing changes to source_distiller.py

  • Committer: Bazaar Package Importer
  • Author(s): Jelmer Vernooij, Colin Watson, Jelmer Vernooij, Robert Collins, James Westby
  • Date: 2010-08-11 18:23:54 UTC
  • Revision ID: james.westby@ubuntu.com-20100811182354-pgqznly5bbtoiso4
Tags: 2.5
[ Colin Watson ]
* Consider a .dsc without a Format: to be Format: 1.0.

[ Jelmer Vernooij ]
* export now uses the timestamp of the last revision, making them more
  deterministic, and so hopefully producing the same tarballs when it is
  used for that.
* Fix use of getattr to have 3 arguments to avoid exception. (LP: #572093)
* Implement the automatic_tag_name hook so that "bzr tag" with no arguments
  will tag based on the version in debian/changelog.
* Support upstream/VERSION tags, for compatibility with git-
  buildpackage. LP: #551362
* Support upstream tarballs without a pristine tar delta.
* Support -r argument to import-upstream.

[ Robert Collins ]
* Add import-upstream command which imports an upstream - useful for
  migrating existing packaging branches into pristine-tar using mode.
* Stop stripping .bzrignore from tarball imports. LP: #496907
* Make the upstream branch authoritative for file ids when importing a
  tarball, stopping errors when files are renamed. LP: #588060

[ James Westby ]
* Add a --package-merge option to builddeb to build with the -v and -sa
  appropriate when doing a merge from Debian or similar. LP: #576027
* Fixed a logic error that stops -r working in merge-upstream. LP: #594575

[ Jelmer Vernooij ]
* Determine Bazaar home directory using bzrlib to prevent test
  isolation issues. Closes: #614125
* Bump standards version to 3.9.1 (no changes).

Show diffs side-by-side

added added

removed removed

Lines of Context:
24
24
import tempfile
25
25
 
26
26
from bzrlib import errors as bzr_errors
27
 
from bzrlib.export import export
28
27
 
29
28
from bzrlib.plugins.builddeb.errors import (
30
29
        TarFailed,
31
30
        )
32
31
from bzrlib.plugins.builddeb.util import (
 
32
        export,
33
33
        get_parent_dir,
34
34
        recursive_copy,
35
35
        subprocess_setup,
108
108
        self.upstream_provider.provide(parent_dir)
109
109
        if self.is_working_tree:
110
110
            self._prepare_working_tree()
111
 
        export(self.tree, target, None, None)
 
111
        export(self.tree, target)
112
112
 
113
113
 
114
114
class MergeModeDistiller(SourceDistiller):
152
152
                export_dir = tempdir
153
153
            if self.is_working_tree:
154
154
                self._prepare_working_tree()
155
 
            export(self.tree,export_dir,None,None)
 
155
            export(self.tree, export_dir)
156
156
            # Remove any upstream debian dir, or from previous export with
157
157
            # use_existing
158
158
            if os.path.exists(os.path.join(target, 'debian')):