← Back to branch summary

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

« back to all changes in this revision

Viewing changes to source_distiller.py

  • Committer: Package Import Robot
  • Author(s): Jelmer Vernooij, Jelmer Vernooij, Martin Packman
  • Date: 2011-10-01 21:27:05 UTC
  • Revision ID: package-import@ubuntu.com-20111001212705-29f1lpwpsdb2dork
Tags: 2.7.9
https://launchpad.net/bugs/853664
http://bugs.debian.org/642818
[ Jelmer Vernooij ]
* Support .tar.xz Debian files rather than .tar.lzma.

[ Martin Packman ]
* Support non-ascii characters in changelog entry when determining
  commit message. LP: #853664

[ Jelmer Vernooij ]
* Use more complete control file during examples. Closes: #642818

Show diffs side-by-side

added added

removed removed

Lines of Context:
source_distiller.py
41
41
 
42
42
    supports_use_existing = False
43
43
 
44
 
    def __init__(self, tree, upstream_provider, larstiq=False,
 
44
    def __init__(self, tree, upstream_provider, top_level=False,
45
45
            use_existing=False, is_working_tree=False):
46
46
        """Create a SourceDistiller to distill from the specified tree.
47
47
 
48
48
        :param tree: The tree to use as the source.
49
49
        :param upstream_provider: an UpstreamProvider to provide the upstream
50
50
            tarball if needed.
51
 
        :param larstiq: if the tree is in the "LarstiQ" layout.
 
51
        :param top_level: if the tree is in the top level directory instead of inside debian/.
52
52
        :param use_existing: whether the distiller should re-use an existing
53
53
            target if the distiller supports it.
54
54
        :param is_working_tree: if `tree` is a working tree.
55
55
        """
56
56
        self.tree = tree
57
57
        self.upstream_provider = upstream_provider
58
 
        self.larstiq = larstiq
 
58
        self.top_level = top_level
59
59
        self.use_existing = use_existing
60
60
        if not self.supports_use_existing:
61
61
            assert not self.use_existing, "distiller doesn't support use_existing"
138
138
        basetempdir = tempfile.mkdtemp(prefix='builddeb-merge-debian-')
139
139
        try:
140
140
            tempdir = os.path.join(basetempdir,"export")
141
 
            if self.larstiq:
 
141
            if self.top_level:
142
142
                os.makedirs(tempdir)
143
143
                export_dir = os.path.join(tempdir, 'debian')
144
144
            else: