/breezy-debian/trunk

To get this branch, use:
bzr branch https://code.breezy-vcs.org/breezy-debian/trunk

« back to all changes in this revision

Viewing changes to cmds.py

  • Committer: Jelmer Vernooij
  • Date: 2018-10-20 22:07:46 UTC
  • Revision ID: jelmer@jelmer.uk-20181020220746-tq6dkzrkvc0nwtlu
Simplify source distiller.

Show diffs side-by-side

added added

removed removed

Lines of Context:
447
447
                changelog.version.upstream_version, orig_dir, upstream_sources)
448
448
 
449
449
            if build_type == BUILD_TYPE_MERGE:
450
 
                distiller_cls = MergeModeDistiller
 
450
                distiller = MergeModeDistiller(tree, upstream_provider,
 
451
                        top_level=top_level, use_existing=use_existing)
451
452
            elif build_type == BUILD_TYPE_NATIVE:
452
 
                distiller_cls = NativeSourceDistiller
 
453
                distiller = NativeSourceDistiller(tree)
453
454
            else:
454
 
                distiller_cls = FullSourceDistiller
455
 
 
456
 
            distiller = distiller_cls(tree, upstream_provider,
457
 
                    top_level=top_level, use_existing=use_existing,
458
 
                    is_working_tree=is_working_tree)
 
455
                distiller = FullSourceDistiller(tree, upstream_provider)
459
456
 
460
457
            build_source_dir = os.path.join(build_dir,
461
458
                    "%s-%s" % (changelog.package,