← Back to branch summary

~launchpad-pqm/launchpad/devel

« back to all changes in this revision

Viewing changes to lib/lp/registry/model/distroseries.py

  • Committer: Launchpad Patch Queue Manager
  • Date: 2011-06-08 15:27:40 UTC
  • mfrom: (13168.2.2 reorder-createqueue-params)
  • Revision ID: launchpad@pqm.canonical.com-20110608152740-m91629fwdomjry1d
[r=julian-edwards][no-qa] Re-order parameters on
 IDistroSeries.createQueueEntry so changesfiles can be optional

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/lp/registry/model/distroseries.py
1607
1607
                    version = None
1608
1608
                get_property_cache(spph).newer_distroseries_version = version
1609
1609
 
1610
 
    def createQueueEntry(self, pocket, changesfilename, changesfilecontent,
1611
 
                         archive, signing_key=None, package_copy_job=None):
 
1610
    def createQueueEntry(self, pocket, archive, changesfilename=None,
 
1611
                         changesfilecontent=None, signing_key=None,
 
1612
                         package_copy_job=None):
1612
1613
        """See `IDistroSeries`."""
1613
1614
        # We store the changes file in the librarian to avoid having to
1614
1615
        # deal with broken encodings in these files; this will allow us
1619
1620
        # at best, causing unpredictable corruption), and simply pass it
1620
1621
        # off to the librarian.
1621
1622
 
 
1623
        if package_copy_job is None and (
 
1624
            changesfilename is None or changesfilecontent is None):
 
1625
            raise AssertionError(
 
1626
                "changesfilename and changesfilecontent must be supplied "
 
1627
                "if there is no package_copy_job")
 
1628
 
1622
1629
        # The PGP signature is stripped from all changesfiles
1623
1630
        # to avoid replay attacks (see bugs 159304 and 451396).
1624
1631
        signed_message = signed_message_from_string(changesfilecontent)