~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/scripts/initialize_distroseries.py

  • Committer: Raphael Badin
  • Date: 2011-07-25 15:53:38 UTC
  • mto: This revision was merged to the branch mainline in revision 13520.
  • Revision ID: raphael.badin@canonical.com-20110725155338-zyirjizt3zkx9rpl
The package copier method in initialize distroseries should take packages from RELEASE, UPDATES and SECURITY.

Show diffs side-by-side

added added

removed removed

Lines of Context:
432
432
                else:
433
433
                    # There is only one available pocket in an unreleased
434
434
                    # series.
435
 
                    pocket = PackagePublishingPocket.RELEASE
 
435
                    target_pocket = PackagePublishingPocket.RELEASE
 
436
                    pockets_to_copy = (
 
437
                        PackagePublishingPocket.RELEASE,
 
438
                        PackagePublishingPocket.UPDATES,
 
439
                        PackagePublishingPocket.SECURITY)
436
440
                    sources = archive.getPublishedSources(
437
 
                        distroseries=parent, pocket=pocket, name=spns)
 
441
                        distroseries=parent, pocket=pockets_to_copy,
 
442
                        name=spns)
438
443
                    # XXX: rvb 2011-06-23 bug=801112: do_copy is atomic (all
439
444
                    # or none of the sources will be copied). This might
440
445
                    # lead to a partially initialised series if there is a
442
447
                    try:
443
448
                        sources_published = do_copy(
444
449
                            sources, target_archive, self.distroseries,
445
 
                            pocket, include_binaries=not self.rebuild,
 
450
                            target_pocket, include_binaries=not self.rebuild,
446
451
                            check_permissions=False, strict_binaries=False,
447
452
                            close_bugs=False, create_dsd_job=False)
448
453
                        if self.rebuild: