Merge lp:~wgrant/launchpad/refactor-_dominateBinary into lp:launchpad

[William Grant]

Move per-publication Dominator logic into the model.

This branch shuffles lots of logic from lp.archivepublisher into the model. The diff is horrific, I admit, but the files have ended up much cleaner than before.

Package domination is currently performed by lp.archivepublisher.domination.Dominator. It finds a list of domination candidates, then calls its _dominateSource and _dominateBinary methods to supersede each publication. But there's a a method for that purpose on IPublishing, which I(Source|Binary)PackagePublishingHistory inherit: IPublishing.supersede. Sadly, this method is only used in tests, and doesn't encapsulate the full functionality required to replace _dominateBinary and _dominateSource.

This branch moves the logic from _dominateBinary and _dominateSource into [SB]PPH.supersede, letting Dominator just identify candidates and call a single method on each to let them handle themselves.

SPPH.supersede is simple: it checks that the publication can be superseded, then calls the base method (setting datesuperseded and status), and sets supersededby if a dominant publication is provided.

BPPH.supersede does the same, but also incorporates additional functionality from _dominateBinar*ies*: the atomic arch-indep domination behaviour. As described in bug #48760, this requires that if an architecture-independent publication is superseded, it should immediately supersede the corresponding publications on every other architecture. This is implemented by moving Dominator._getOtherBinaryPublications to BPPH._getOtherPublications, and superseding publications found by it. With that behaviour encapsulated in the model, the Dominator code ends up much cleaner.

With all that code ripped out into the model, some duplication was revealed in Dominator. A couple of methods had distinct source and binary versions, with only simple attribute name differences. I've merged them by passing around a couple of attrgetters. Not pretty, but better than duplicating the code.

All this brings huge potential for test cleanups. But this branch is big enough, so another (slightly oversized) test rewrite branch follows.

[Robert Collins (lifeless)]

your VWS in supersede doesn't really gel for me - please remove or comment

review: Approve

=== modified file 'lib/lp/archivepublisher/domination.py'
--- lib/lp/archivepublisher/domination.py	2010-05-18 10:30:12 +0000
+++ lib/lp/archivepublisher/domination.py	2010-07-20 09:44:57 +0000
@@ -52,9 +52,12 @@
 
 __all__ = ['Dominator']
 
-import apt_pkg
 from datetime import timedelta
+import functools
 import gc
+import operator
+
+import apt_pkg
 
 from lp.archivepublisher import ELIGIBLE_DOMINATION_STATES
 from canonical.database.constants import UTC_NOW
@@ -73,38 +76,23 @@
     clear_current_connection_cache()
     gc.collect()
 
-PENDING = PackagePublishingStatus.PENDING
-PUBLISHED = PackagePublishingStatus.PUBLISHED
-SUPERSEDED = PackagePublishingStatus.SUPERSEDED
-DELETED = PackagePublishingStatus.DELETED
-OBSOLETE = PackagePublishingStatus.OBSOLETE
 
 # Ugly, but works
 apt_pkg.InitSystem()
 
-def _compare_source_packages_by_version_and_date(p1, p2):
-    """Compare packages p1 and p2 by their version; using Debian rules.
-
-    If the comparison is the same sourcepackagerelease, compare by datecreated
-    instead. So later records beat earlier ones.
-    """
-    if p1.sourcepackagerelease.id == p2.sourcepackagerelease.id:
-        return cmp(p1.datecreated, p2.datecreated)
-
-    return apt_pkg.VersionCompare(p1.sourcepackagerelease.version,
-                                  p2.sourcepackagerelease.version)
-
-def _compare_binary_packages_by_version_and_date(p1, p2):
-    """Compare packages p1 and p2 by their version; using Debian rules
-
-    If the comparison is the same binarypackagerelease, compare by datecreated
-    instead. So later records beat earlier ones.
-    """
-    if p1.binarypackagerelease.id == p2.binarypackagerelease.id:
-        return cmp(p1.datecreated, p2.datecreated)
-
-    return apt_pkg.VersionCompare(p1.binarypackagerelease.version,
-                                  p2.binarypackagerelease.version)
+
+def _compare_packages_by_version_and_date(get_release, p1, p2):
+    """Compare publications p1 and p2 by their version; using Debian rules.
+
+    If the publications are for the same package, compare by datecreated
+    instead. This lets newer records win.
+    """
+    if get_release(p1).id == get_release(p2).id:
+        return cmp(p1.datecreated, p2.datecreated)
+
+    return apt_pkg.VersionCompare(get_release(p1).version,
+                                  get_release(p2).version)
+
 
 class Dominator:
     """ Manage the process of marking packages as superseded.
@@ -123,131 +111,22 @@
         self.archive = archive
         self.debug = self._logger.debug
 
-    def _dominateSource(self, sourceinput):
-        """
-        Perform dominations for source.
-        """
-        self.debug("Dominating sources...")
-        for sourcename in sourceinput.keys():
-            # source is a list of versions ordered most-recent-first
-            # basically skip the first entry because that is
-            # never dominated by us, then just set subsequent entries
-            # to SUPERSEDED unless they're already there or pending
-            # removal
-            assert sourceinput[sourcename], (
-                "Empty list of publications for %s" % sourcename)
-            super_release = sourceinput[sourcename][0].sourcepackagerelease
-            super_release_name = super_release.sourcepackagename.name
-            for pubrec in sourceinput[sourcename][1:]:
-                if pubrec.status == PUBLISHED or pubrec.status == PENDING:
-                    this_release = pubrec.sourcepackagerelease
-
-                    this_release_name = this_release.sourcepackagename.name
-                    self.debug(
-                        "%s/%s has been judged as superseded by %s/%s" %
-                        (this_release_name, this_release.version,
-                         super_release_name, super_release.version))
-
-                    pubrec.status = SUPERSEDED
-                    pubrec.datesuperseded = UTC_NOW
-                    pubrec.supersededby = super_release
-
-    def _getOtherBinaryPublications(self, dominated):
-        """Return remaining publications of the same binarypackagerelease.
-
-        It only considers binary publications in the same distroseries,
-        pocket and archive context, which is the limit where the domination
-        should happen.
-
-        Return only binaries published or pending in the same component,
-        section and priority, this way the just-made override will be
-        preserved.
-        """
-        # Avoid circular imports.
-        from lp.soyuz.model.publishing import (
-             BinaryPackagePublishingHistory)
-
-        dominated_series = dominated.distroarchseries.distroseries
-        available_architectures = [
-            das.id for das in dominated_series.architectures]
-        query = """
-            BinaryPackagePublishingHistory.status IN %s AND
-            BinaryPackagePublishingHistory.distroarchseries IN %s AND
-            BinaryPackagePublishingHistory.binarypackagerelease = %s AND
-            BinaryPackagePublishingHistory.pocket = %s AND
-            BinaryPackagePublishingHistory.archive = %s AND
-            BinaryPackagePublishingHistory.component = %s AND
-            BinaryPackagePublishingHistory.section = %s AND
-            BinaryPackagePublishingHistory.priority = %s
-        """ % sqlvalues([PUBLISHED, PENDING], available_architectures,
-                        dominated.binarypackagerelease, dominated.pocket,
-                        dominated.archive, dominated.component,
-                        dominated.section, dominated.priority)
-        return BinaryPackagePublishingHistory.select(query)
-
-    def _dominateBinary(self, dominated, dominant):
-        """Dominate the given binarypackagerelease publication."""
-        # At this point only PUBLISHED (ancient versions) or PENDING (
-        # multiple overrides/copies) publications should be given. We
-        # tolerate SUPERSEDED architecture-independent binaries, because
-        # they are dominated automatically once the first publication is
-        # processed.
-        if dominated.status not in [PUBLISHED, PENDING]:
-            arch_independent = (
-                dominated.binarypackagerelease.architecturespecific == False)
-            assert arch_independent, (
-                "Should not dominate unpublished architecture specific "
-                "binary %s (%s)" % (
-                dominated.binarypackagerelease.title,
-                dominated.distroarchseries.architecturetag))
-            return
-
-        dominant_build = dominant.binarypackagerelease.build
-        distroarchseries = dominant_build.distro_arch_series
-        self.debug(
-            "The %s build of %s has been judged as superseded by the build "
-            "of %s.  Arch-specific == %s" % (
-            distroarchseries.architecturetag,
-            dominated.binarypackagerelease.title,
-            dominant.binarypackagerelease.build.source_package_release.title,
-            dominated.binarypackagerelease.architecturespecific))
-        dominated.status = SUPERSEDED
-        dominated.datesuperseded = UTC_NOW
-        # Binary package releases are superseded by the new build,
-        # not the new binary package release. This is because
-        # there may not *be* a new matching binary package -
-        # source packages can change the binaries they build
-        # between releases.
-        dominated.supersededby = dominant_build
-
-    def _dominateBinaries(self, binaryinput):
-        """Perform dominations for binaries."""
-        self.debug("Dominating binaries...")
-        for binaryname in binaryinput.keys():
-            # binary is a list of versions ordered most-recent-first
-            # basically skip the first entry because that is
-            # never dominated by us, then just set subsequent entries
-            # to SUPERSEDED unless they're already there or pending
-            # removal
-            assert binaryinput[binaryname], (
-                "Empty list of publications for %s" % binaryname)
-            # At some future point, this code might automatically locate
-            # binaries which are no longer built from source (NBS).
-            # Currently this is done in archive cruft check.
-            dominant = binaryinput[binaryname][0]
-            for dominated in binaryinput[binaryname][1:]:
-                # Dominate all publications of architecture independent
-                # binaries altogether in this distroseries and pocket.
-                if not dominated.binarypackagerelease.architecturespecific:
-                    other_publications = self._getOtherBinaryPublications(
-                        dominated)
-                    for dominated in other_publications:
-                        self._dominateBinary(dominated, dominant)
-                else:
-                    self._dominateBinary(dominated, dominant)
-
-
-    def _sortPackages(self, pkglist, isSource=True):
+    def _dominatePublications(self, pubs):
+        """Perform dominations for the given publications.
+
+        :param pubs: A dict mapping names to a list of publications. Every
+            publication must be PUBLISHED or PENDING, and the first in each
+            list will be treated as dominant (so should be the latest).
+        """
+        self.debug("Dominating packages...")
+
+        for name in pubs.keys():
+            assert pubs[name], (
+                "Empty list of publications for %s" % name)
+            for pubrec in pubs[name][1:]:
+                pubrec.supersede(pubs[name][0], self)
+
+    def _sortPackages(self, pkglist, is_source=True):
         # pkglist is a list of packages with the following
         #  * sourcepackagename or packagename as appropriate
         #  * version
@@ -255,32 +134,22 @@
         # Don't care about any other attributes
         outpkgs = {}
 
-        if isSource:
-            self.debug("Sorting sources...")
-        else:
-            self.debug("Sorting binaries...")
+        self.debug("Sorting packages...")
+
+        attr_prefix = 'source' if is_source else 'binary'
+        get_release = operator.attrgetter(attr_prefix + 'packagerelease')
+        get_name = operator.attrgetter(attr_prefix + 'packagename')
 
         for inpkg in pkglist:
-            if isSource:
-                L = outpkgs.setdefault(
-                    inpkg.sourcepackagerelease.sourcepackagename.name.encode(
-                    'utf-8'), [])
-            else:
-                L = outpkgs.setdefault(
-                    inpkg.binarypackagerelease.binarypackagename.name.encode(
-                    'utf-8'), [])
-
+            L = outpkgs.setdefault(
+                get_name(get_release(inpkg)).name.encode('utf-8'), [])
             L.append(inpkg)
 
         for pkgname in outpkgs:
             if len(outpkgs[pkgname]) > 1:
-                if isSource:
-                    outpkgs[pkgname].sort(
-                        _compare_source_packages_by_version_and_date)
-                else:
-                    outpkgs[pkgname].sort(
-                        _compare_binary_packages_by_version_and_date)
-
+                outpkgs[pkgname].sort(
+                    functools.partial(
+                        _compare_packages_by_version_and_date, get_release))
                 outpkgs[pkgname].reverse()
 
         return outpkgs
@@ -443,11 +312,12 @@
                     binarypackagerelease.id
                 AND binarypackagerelease.binarypackagename IN (
                     SELECT name FROM PubDomHelper WHERE count > 1)"""
-                % sqlvalues (distroarchseries, self.archive,
-                             pocket, PackagePublishingStatus.PUBLISHED),
+                % sqlvalues(distroarchseries, self.archive,
+                            pocket, PackagePublishingStatus.PUBLISHED),
                 clauseTables=['BinaryPackageRelease'])
 
-            self._dominateBinaries(self._sortPackages(binaries, False))
+            self.debug("Dominating binaries...")
+            self._dominatePublications(self._sortPackages(binaries, False))
             if do_clear_cache:
                 self.debug("Flushing SQLObject cache.")
                 clear_cache()
@@ -464,7 +334,8 @@
         sources = SourcePackagePublishingHistory.selectBy(
             distroseries=dr, archive=self.archive, pocket=pocket,
             status=PackagePublishingStatus.PUBLISHED)
-        self._dominateSource(self._sortPackages(sources))
+        self.debug("Dominating sources...")
+        self._dominatePublications(self._sortPackages(sources))
         flush_database_updates()
 
         sources = SourcePackagePublishingHistory.select("""
@@ -492,4 +363,3 @@
 
         self.debug("Domination for %s/%s finished" %
                    (dr.name, pocket.title))
-
 
=== modified file 'lib/lp/archivepublisher/tests/test_dominator.py'
--- lib/lp/archivepublisher/tests/test_dominator.py	2010-07-18 00:24:06 +0000
+++ lib/lp/archivepublisher/tests/test_dominator.py	2010-07-20 09:44:57 +0000
@@ -75,7 +75,7 @@
         # and dominated, the subsequents.
         source_input = {'foo': [dominant_source, dominated_source]}
 
-        dominator._dominateSource(source_input)
+        dominator._dominatePublications(source_input)
         flush_database_updates()
 
         # The dominant version remains correctly published.
@@ -96,7 +96,7 @@
         dominator = Dominator(self.logger, self.ubuntutest.main_archive)
         source_input = {'foo': []}
         self.assertRaises(
-            AssertionError, dominator._dominateSource, source_input)
+            AssertionError, dominator._dominatePublications, source_input)
 
     def testBinariesDomination(self):
         """Test overall binary domination procedure."""
@@ -108,7 +108,7 @@
         # See comment about domination input format and ordering above.
         binary_input = {'foo-bin': [dominant, dominated]}
 
-        dominator._dominateBinaries(binary_input)
+        dominator._dominatePublications(binary_input)
         flush_database_updates()
 
         # Dominant version remains correctly published.
@@ -129,7 +129,7 @@
         dominator = Dominator(self.logger, self.ubuntutest.main_archive)
         binary_input = {'foo-bin': []}
         self.assertRaises(
-            AssertionError, dominator._dominateBinaries, binary_input)
+            AssertionError, dominator._dominatePublications, binary_input)
 
     def testBinaryDomination(self):
         """Test binary domination unit procedure."""
@@ -138,7 +138,7 @@
         [dominant_source, dominant, dominated_source,
          dominated] = self.createSimpleDominationContext()
 
-        dominator._dominateBinary(dominated, dominant)
+        dominated.supersede(dominant)
         flush_database_updates()
 
         dominated = self.checkBinaryPublication(
@@ -150,7 +150,7 @@
     def testBinaryDominationAssertsPendingOrPublished(self):
         """Test binary domination asserts coherent dominated status.
 
-        Normally _dominateBinary only accepts domination candidates in
+        Normally supersede() only accepts domination candidates in
         PUBLISHED or PENDING status, a exception is opened for architecture
         independent binaries because during the iteration they might have
         been already SUPERSEDED with its first publication, when it happens
@@ -165,7 +165,7 @@
          dominated] = self.createSimpleDominationContext()
 
         # Let's modify the domination candidate, so it will look wrong to
-        # _dominateBinary which will raise because it's a architecture
+        # supersede() which will raise because it's a architecture
         # specific binary publication not in PENDING or PUBLISHED state.
         dominated.status = PackagePublishingStatus.SUPERSEDED
         manual_domination_date = datetime.datetime(
@@ -176,7 +176,7 @@
         # An error like that in production clearly indicates that something
         # is wrong in the Dominator look-up methods.
         self.assertRaises(
-            AssertionError, dominator._dominateBinary, dominated, dominant)
+            AssertionError, dominated.supersede, dominant)
 
         # The refused publishing record remains the same.
         dominated = self.checkBinaryPublication(
@@ -188,7 +188,7 @@
         dominated.binarypackagerelease.architecturespecific = False
         flush_database_updates()
 
-        dominator._dominateBinary(dominated, dominant)
+        dominated.supersede(dominant)
         flush_database_updates()
         dominated = self.checkBinaryPublication(
             dominated, PackagePublishingStatus.SUPERSEDED)
@@ -197,14 +197,12 @@
     def testOtherBinaryPublications(self):
         """Check the basis of architecture independent binary domination.
 
-        We use _getOtherBinaryPublications to identify other publications of
-        the same binarypackagerelease in other architectures (architecture
+        We use _getOtherPublications to identify other publications of the
+        same binarypackagerelease in other architectures (architecture
         independent binaries), they will be dominated during a single step.
 
         See overall details in `testDominationOfOldArchIndepBinaries`.
         """
-        dominator = Dominator(self.logger, self.ubuntutest.main_archive)
-
         # Create architecture independent publications for foo-bin_1.0
         # in i386 & hppa.
         pub_source_archindep = self.getPubSource(
@@ -232,7 +230,7 @@
 
         # Check if we can reach the i386 publication using
         # _getOtherBinaryPublications over the hppa binary.
-        [found] = list(dominator._getOtherBinaryPublications(hppa_pub))
+        [found] = list(hppa_pub._getOtherPublications())
         self.assertEqual(i386_pub, found)
 
         # Create architecture specific publications for foo-bin_1.1 in
@@ -251,7 +249,7 @@
         # Check if there is no other publication of the hppa binary package
         # release.
         self.assertEqual(
-            dominator._getOtherBinaryPublications(hppa_pub).count(),
+            hppa_pub._getOtherPublications().count(),
             0)
 
     def testDominationOfOldArchIndepBinaries(self):
 
=== modified file 'lib/lp/registry/doc/distroseries.txt'
--- lib/lp/registry/doc/distroseries.txt	2010-06-22 19:37:43 +0000
+++ lib/lp/registry/doc/distroseries.txt	2010-07-20 09:44:57 +0000
@@ -593,17 +593,17 @@
 Supersede previous netapplet publication:
 
    >>> last_published = netapplet_srcrel.publishing_history[1]
-   >>> superseded_netapplet = last_published.supersede()
+   >>> last_published.supersede()
    >>> flush_database_updates()
 
    >>> netapplet_srcrel.publishing_history.count()
    2
 
-   >>> print superseded_netapplet.status.name
+   >>> print last_published.status.name
    SUPERSEDED
 
    >>> from canonical.database.sqlbase import get_transaction_timestamp
-   >>> superseded_netapplet.datesuperseded == get_transaction_timestamp()
+   >>> last_published.datesuperseded == get_transaction_timestamp()
    True
 
 
 
=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-07-02 21:25:36 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-07-20 09:44:57 +0000
@@ -913,10 +913,8 @@
 
     >>> cprov_archive.number_of_sources
     3
-    >>> superseded = cprov_archive.getPublishedSources(
+    >>> cprov_archive.getPublishedSources(
     ...     name='cdrkit')[0].supersede()
-    >>> from canonical.launchpad.ftests import syncUpdate
-    >>> syncUpdate(superseded)
 
     >>> cprov_archive.number_of_sources
     2
@@ -926,9 +924,8 @@
 
     >>> cprov_archive.number_of_binaries
     3
-    >>> superseded = cprov_archive.getAllPublishedBinaries(
+    >>> cprov_archive.getAllPublishedBinaries(
     ...     name='mozilla-firefox')[0].supersede()
-    >>> syncUpdate(superseded)
 
     >>> cprov_archive.number_of_binaries
     2
@@ -982,7 +979,6 @@
 
     >>> login("[e-mail]")
     >>> removal_candidate.requestDeletion(cprov, 'go away !')
-    >>> syncUpdate(removal_candidate)
 
     >>> cprov_archive.getSourcesForDeletion(name='ice').count()
     1
@@ -1022,7 +1018,6 @@
 
     >>> for bin in removal_candidate.getPublishedBinaries():
     ...     bin.requestDeletion(cprov, 'go away !')
-    ...     syncUpdate(bin)
 
     >>> cprov_archive.getSourcesForDeletion(name='ice').count()
     0
 
=== modified file 'lib/lp/soyuz/doc/distroarchseries.txt'
--- lib/lp/soyuz/doc/distroarchseries.txt	2010-05-13 20:01:58 +0000
+++ lib/lp/soyuz/doc/distroarchseries.txt	2010-07-20 09:44:57 +0000
@@ -123,12 +123,11 @@
 
 Supersede current publication:
 
-   >>> pmount_pubrec = pmount_hoary_i386_released.current_publishing_record
-   >>> superseded_pmount = pmount_pubrec.supersede()
+   >>> pub = pmount_hoary_i386_released.current_publishing_record
+   >>> pub.supersede()
    >>> pmount_hoary_i386.publishing_history.count()
    3
 
-   >>> pub = superseded_pmount
    >>> print pub.status.name, pub.datesuperseded is not None
    SUPERSEDED True
 
 
=== modified file 'lib/lp/soyuz/doc/publishing.txt'
--- lib/lp/soyuz/doc/publishing.txt	2010-05-27 22:18:16 +0000
+++ lib/lp/soyuz/doc/publishing.txt	2010-07-20 09:44:57 +0000
@@ -543,11 +543,8 @@
 excluded from the getPublishedBinaries() results, but not from the
 getBuiltBinaries() result.
 
-    >>> from canonical.launchpad.ftests import syncUpdate
-
     >>> a_binary = source.getPublishedBinaries()[0]
-    >>> superseded = a_binary.supersede()
-    >>> syncUpdate(superseded)
+    >>> a_binary.supersede()
 
     >>> len(source.getPublishedBinaries())
     1
@@ -561,7 +558,6 @@
     >>> deletable = source.getPublishedBinaries()[0]
     >>> deletable.requestDeletion(mark, "go")
     >>> deleted = deletable
-    >>> syncUpdate(deleted)
 
     >>> len(source.getPublishedBinaries())
     0
@@ -577,7 +573,6 @@
 
     >>> for bin in copied_source.getPublishedBinaries():
     ...     obsoleted = bin.requestObsolescence()
-    ...     syncUpdate(obsoleted)
 
     >>> len(copied_source.getPublishedBinaries())
     0
@@ -596,7 +591,6 @@
     >>> for pub in copied_source.getBuiltBinaries():
     ...     pub.status = PackagePublishingStatus.PUBLISHED
     ...     pub.scheduleddeletiondate = None
-    ...     syncUpdate(pub)
 
 Now we override the first binary publication, the hppa one, to
 component 'universe'.
@@ -631,10 +625,8 @@
 We have to re-publish the superseded and the deleted publications above
 because it's used below.
 
-    >>> superseded.status = PackagePublishingStatus.PUBLISHED
-    >>> syncUpdate(superseded)
+    >>> a_binary.status = PackagePublishingStatus.PUBLISHED
     >>> deleted.status = PackagePublishingStatus.PUBLISHED
-    >>> syncUpdate(deleted)
 
 
 Copying and inspecting architecture independent binaries
 
=== modified file 'lib/lp/soyuz/interfaces/publishing.py'
--- lib/lp/soyuz/interfaces/publishing.py	2010-03-11 02:32:07 +0000
+++ lib/lp/soyuz/interfaces/publishing.py	2010-07-20 09:44:57 +0000
@@ -278,12 +278,7 @@
         """
 
     def supersede():
-        """Supersede this publication.
-
-        :return: The superseded publishing records, either a
-            `ISourcePackagePublishingHistory` or
-            `IBinaryPackagePublishingHistory`.
-        """
+        """Supersede this publication."""
 
     def requestObsolescence():
         """Make this publication obsolete.
@@ -632,6 +627,15 @@
         :return: a list of `ILibraryFileAlias`.
         """
 
+    def supersede(dominant=None, logger=None):
+        """Supersede this publication.
+
+        :param dominant: optional `ISourcePackagePublishingHistory` which is
+            triggering the domination.
+        :param logger: optional object to which debug information will be
+            logged.
+        """
+
     def changeOverride(new_component=None, new_section=None):
         """Change the component and/or section of this publication
 
@@ -838,6 +842,15 @@
             title=_("Priority Name"),
             required=False, readonly=True))
 
+    def supersede(dominant=None, logger=None):
+        """Supersede this publication.
+
+        :param dominant: optional `IBinaryPackagePublishingHistory` which is
+            triggering the domination.
+        :param logger: optional object to which debug information will be
+            logged.
+        """
+
     def changeOverride(new_component=None, new_section=None,
                        new_priority=None):
         """Change the component, section and/or priority of this publication.
 
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2010-07-20 09:16:14 +0000
+++ lib/lp/soyuz/model/publishing.py	2010-07-20 09:44:57 +0000
@@ -37,6 +37,7 @@
 from canonical.database.enumcol import EnumCol
 from canonical.launchpad.components.decoratedresultset import (
     DecoratedResultSet)
+from canonical.launchpad.interfaces.lpstorm import IMasterStore
 from canonical.launchpad.webapp.interfaces import (
     IStoreSelector, MAIN_STORE, DEFAULT_FLAVOR)
 from canonical.launchpad.webapp.interfaces import NotFoundError
@@ -70,6 +71,10 @@
 from lp.soyuz.scripts.changeoverride import ArchiveOverriderError
 
 
+PENDING = PackagePublishingStatus.PENDING
+PUBLISHED = PackagePublishingStatus.PUBLISHED
+
+
 # XXX cprov 2006-08-18: move it away, perhaps archivepublisher/pool.py
 def makePoolPath(source_name, component_name):
     """Return the pool path for a given source name and component name."""
@@ -271,7 +276,6 @@
         """See `IPublishing`."""
         self.status = PackagePublishingStatus.SUPERSEDED
         self.datesuperseded = UTC_NOW
-        return self
 
     def requestDeletion(self, removed_by, removal_comment=None):
         """See `IPublishing`."""
@@ -673,6 +677,25 @@
 
         return fields
 
+    def supersede(self, dominant=None, logger=None):
+        """See `ISourcePackagePublishingHistory`."""
+        assert self.status in [PUBLISHED, PENDING], (
+            "Should not dominate unpublished source %s" %
+            self.sourcepackagerelease.title)
+
+        super(SourcePackagePublishingHistory, self).supersede()
+
+        if dominant is not None:
+            if logger is not None:
+                logger.debug(
+                    "%s/%s has been judged as superseded by %s/%s" %
+                    (self.sourcepackagerelease.sourcepackagename.name,
+                     self.sourcepackagerelease.version,
+                     dominant.sourcepackagerelease.sourcepackagename.name,
+                     dominant.sourcepackagerelease.version))
+
+            self.supersededby = dominant.sourcepackagerelease
+
     def changeOverride(self, new_component=None, new_section=None):
         """See `ISourcePackagePublishingHistory`."""
         # Check we have been asked to do something
@@ -927,6 +950,73 @@
 
         return fields
 
+    def _getOtherPublications(self):
+        """Return remaining publications with the same overrides.
+
+        Only considers binary publications in the same archive, distroseries,
+        pocket, component, section and priority context. These publications
+        are candidates for domination if this is an architecture-independent
+        package.
+
+        The override match is critical -- it prevents a publication created
+        by new overrides from superseding itself.
+        """
+        available_architectures = [
+            das.id for das in self.distroarchseries.distroseries.architectures]
+        return IMasterStore(BinaryPackagePublishingHistory).find(
+                BinaryPackagePublishingHistory,
+                BinaryPackagePublishingHistory.status.is_in(
+                    [PUBLISHED, PENDING]),
+                BinaryPackagePublishingHistory.distroarchseries in (
+                    available_architectures),
+                binarypackagerelease=self.binarypackagerelease,
+                archive=self.archive,
+                pocket=self.pocket,
+                component=self.component,
+                section=self.section,
+                priority=self.priority)
+
+    def supersede(self, dominant=None, logger=None):
+        """See `IBinaryPackagePublishingHistory`."""
+        # At this point only PUBLISHED (ancient versions) or PENDING (
+        # multiple overrides/copies) publications should be given. We
+        # tolerate SUPERSEDED architecture-independent binaries, because
+        # they are dominated automatically once the first publication is
+        # processed.
+        if self.status not in [PUBLISHED, PENDING]:
+            assert not self.binarypackagerelease.architecturespecific, (
+                "Should not dominate unpublished architecture specific "
+                "binary %s (%s)" % (
+                self.binarypackagerelease.title,
+                self.distroarchseries.architecturetag))
+            return
+
+        super(BinaryPackagePublishingHistory, self).supersede()
+
+        if dominant is not None:
+            dominant_build = dominant.binarypackagerelease.build
+            distroarchseries = dominant_build.distro_arch_series
+            if logger is not None:
+                logger.debug(
+                    "The %s build of %s has been judged as superseded by the "
+                    "build of %s.  Arch-specific == %s" % (
+                    distroarchseries.architecturetag,
+                    self.binarypackagerelease.title,
+                    dominant_build.source_package_release.title,
+                    self.binarypackagerelease.architecturespecific))
+            # Binary package releases are superseded by the new build,
+            # not the new binary package release. This is because
+            # there may not *be* a new matching binary package -
+            # source packages can change the binaries they build
+            # between releases.
+            self.supersededby = dominant_build
+
+        # If this is architecture-independet, all publications with the same
+        # context and overrides should be dominated simultaneously.
+        if not self.binarypackagerelease.architecturespecific:
+            for dominated in self._getOtherPublications():
+                dominated.supersede(dominant, logger)
+
     def changeOverride(self, new_component=None, new_section=None,
                        new_priority=None):
         """See `IBinaryPackagePublishingHistory`."""
 
=== modified file 'lib/lp/soyuz/scripts/ftpmaster.py'
--- lib/lp/soyuz/scripts/ftpmaster.py	2010-04-13 14:28:58 +0000
+++ lib/lp/soyuz/scripts/ftpmaster.py	2010-07-20 09:44:57 +0000
@@ -451,13 +451,14 @@
                 dasbp = distroarchseries.getBinaryPackage(binarypackagename)
                 dasbpr = dasbp.currentrelease
                 try:
-                    sbpph = dasbpr.current_publishing_record.supersede()
+                    bpph = dasbpr.current_publishing_record
+                    bpph.supersede()
                     # We're blindly removing for all arches, if it's not there
                     # for some, that's fine ...
                 except NotFoundError:
                     pass
                 else:
-                    version = sbpph.binarypackagerelease.version
+                    version = bpph.binarypackagerelease.version
                     self.logger.info ("Removed %s_%s from %s/%s ... "
                                       % (package, version,
                                          self.distroseries.name,