← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/soyuz/model/queue.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-06-02 15:19:38 UTC
  • mfrom: (13144.1.3 notify-announce-list)
  • Revision ID: launchpad@pqm.canonical.com-20110602151938-tawdrs82nnt4fp3q
[r=wgrant][no-qa] Drop announce_list from notify() and
        PackageUpload.acceptFromQueue(), leaving it up to notify() internals.

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/soyuz/model/queue.py
392
392
        self._closeBugs(changesfile_path, logger)
393
393
        self._giveKarma()
394
394
 
395
 
    def acceptFromQueue(self, announce_list, logger=None, dry_run=False):
 
395
    def acceptFromQueue(self, logger=None, dry_run=False):
396
396
        """See `IPackageUpload`."""
397
397
        assert not self.is_delayed_copy, 'Cannot process delayed copies.'
398
398
 
402
402
        # is pulled from the librarian which are stripped of their
403
403
        # signature just before being stored.
404
404
        self.notify(
405
 
            announce_list=announce_list, logger=logger, dry_run=dry_run,
 
405
            logger=logger, dry_run=dry_run,
406
406
            changes_file_object=changes_file_object)
407
407
        self.syncUpdate()
408
408
 
633
633
                    changes_file_object = StringIO.StringIO(
634
634
                        changes_file.read())
635
635
                    self.notify(
636
 
                        announce_list=self.distroseries.changeslist,
637
636
                        changes_file_object=changes_file_object,
638
637
                        logger=logger)
639
638
                    self.syncUpdate()
683
682
        # and uploading to any archive as the signer.
684
683
        return changes, strip_pgp_signature(changes_content).splitlines(True)
685
684
 
686
 
    def notify(self, announce_list=None, summary_text=None,
687
 
               changes_file_object=None, logger=None, dry_run=False):
 
685
    def notify(self, summary_text=None, changes_file_object=None,
 
686
               logger=None, dry_run=False):
688
687
        """See `IPackageUpload`."""
689
688
        status_action = {
690
689
            PackageUploadStatus.NEW: 'new',
704
703
            signer = None
705
704
        notify(
706
705
            signer, self.sourcepackagerelease, self.builds, self.customfiles,
707
 
            self.archive, self.distroseries, self.pocket, announce_list,
708
 
            summary_text, changes, changesfile_content, changes_file_object,
 
706
            self.archive, self.distroseries, self.pocket, summary_text,
 
707
            changes, changesfile_content, changes_file_object,
709
708
            status_action[self.status], dry_run, logger)
710
709
 
711
710
    def _isPersonUploader(self, person):