← Back to branch summary

~bzr-builddeb-hackers/bzr-builddeb/trunk

« back to all changes in this revision

Viewing changes to import_dsc.py

  • Committer: Vincent Ladeuil
  • Date: 2011-10-25 10:55:57 UTC
  • Revision ID: v.ladeuil+lp@free.fr-20111025105557-wv5zbo77m4xenpd0
Fix the returned values when dpkg-mergechangelogs is not available.

Also, small tweaks to the DistributionBranch.__init__ doc string found eons ago.

Show diffs side-by-side

added added

removed removed

Lines of Context:
import_dsc.py
207
207
    """
208
208
 
209
209
    def __init__(self, branch, pristine_upstream_branch, tree=None,
210
 
            pristine_upstream_tree=None):
 
210
                 pristine_upstream_tree=None):
211
211
        """Create a distribution branch.
212
212
 
213
213
        You can only import packages on to the DistributionBranch
214
214
        if both tree and pristine_upstream_tree are provided.
215
215
 
216
216
        :param branch: the Branch for the packaging part.
217
 
        :param upstream_pristine_branch: the Branch for the pristine tar part, if any.
 
217
        :param pristine_upstream_branch: the Branch for the pristine tar part,
 
218
            if any.
218
219
        :param tree: an optional tree for the branch.
219
220
        :param pristine_upstream_tree: an optional tree for the
220
 
            upstream_branch.
 
221
            pristine_upstream_branch.
221
222
        """
222
223
        self.branch = branch
223
224
        self.tree = tree