Merge lp:~wgrant/launchpad/abpb into lp:launchpad

[William Grant]

[lp:~wgrant/launchpad/abpb]

17005. By William Grant on 2014-05-06

Adjust the three +build traversals to return ArchiveBinaryPackageBuilds.

17006. By William Grant on 2014-05-07

Stop decorating BPBs into ABPBs manually. Use decorate_binarypackagebuilds instead.

17007. By William Grant on 2014-05-07

Decorate them in Builder.getBuildRecords too.

17008. By William Grant on 2014-05-07

Fix test_hasbuildrecords to unwrap.

17009. By William Grant on 2014-05-07

Fix test_copy_source_and_binaries_from_ppa_does_not_create_builds to compare the BPBs, not the ABPBs. The ABPBs from different archives clearly must differ.

17010. By William Grant on 2014-05-07

Fix lint.

17011. By William Grant on 2014-05-09

Fix ArchiveBuildUrl to return the DSPR in the ABPB's distro, not the BPB's original distro.

Unmerged revisions

17011. By William Grant on 2014-05-09

Fix ArchiveBuildUrl to return the DSPR in the ABPB's distro, not the BPB's original distro.

17010. By William Grant on 2014-05-07

Fix lint.

17009. By William Grant on 2014-05-07

Fix test_copy_source_and_binaries_from_ppa_does_not_create_builds to compare the BPBs, not the ABPBs. The ABPBs from different archives clearly must differ.

17008. By William Grant on 2014-05-07

Fix test_hasbuildrecords to unwrap.

17007. By William Grant on 2014-05-07

Decorate them in Builder.getBuildRecords too.

17006. By William Grant on 2014-05-07

Stop decorating BPBs into ABPBs manually. Use decorate_binarypackagebuilds instead.

17005. By William Grant on 2014-05-06

Adjust the three +build traversals to return ArchiveBinaryPackageBuilds.

17004. By William Grant on 2014-05-06

Merge archive-build-navigation.

17003. By William Grant on 2014-05-06

Fix xx-private-builds.txt to cope with the fact that builds copied into the primary archive now have URLs under the primary archive.

17002. By William Grant on 2014-05-06

Add build_farm_job_id to IBinaryPackageBuild so it gets delegated through ABPB.

=== modified file 'lib/lp/buildmaster/browser/builder.py'
--- lib/lp/buildmaster/browser/builder.py	2014-05-06 09:11:14 +0000
+++ lib/lp/buildmaster/browser/builder.py	2014-05-12 07:22:06 +0000
@@ -64,6 +64,10 @@
     get_build_by_id_str,
     )
 from lp.soyuz.interfaces.binarypackagebuild import IBinaryPackageBuildSet
+from lp.soyuz.model.binarypackagebuild import (
+    BUILD_ARCHIVE,
+    decorate_binarypackagebuilds,
+    )
 
 
 class BuilderSetNavigation(GetitemNavigation):
@@ -75,7 +79,8 @@
         build = get_build_by_id_str(IBinaryPackageBuildSet, name)
         if build is None:
             return None
-        return self.redirectSubTree(canonical_url(build))
+        return self.redirectSubTree(canonical_url(
+            decorate_binarypackagebuilds([build], archive=BUILD_ARCHIVE)[0]))
 
     @stepthrough('+recipebuild')
     def traverse_recipebuild(self, name):
 
=== modified file 'lib/lp/buildmaster/interfaces/buildfarmjob.py'
--- lib/lp/buildmaster/interfaces/buildfarmjob.py	2013-11-21 04:13:12 +0000
+++ lib/lp/buildmaster/interfaces/buildfarmjob.py	2014-05-12 07:22:06 +0000
@@ -65,6 +65,7 @@
     id = Attribute('The build farm job ID.')
 
     build_farm_job = Attribute('Generic build farm job record')
+    build_farm_job_id = Attribute('The BuildFarmJobDB ID.')
 
     processor = Reference(
         IProcessor, title=_("Processor"), required=False, readonly=True,
 
=== modified file 'lib/lp/buildmaster/model/builder.py'
--- lib/lp/buildmaster/model/builder.py	2013-11-28 09:12:45 +0000
+++ lib/lp/buildmaster/model/builder.py	2014-05-12 07:22:06 +0000
@@ -186,9 +186,15 @@
     def getBuildRecords(self, build_state=None, name=None, pocket=None,
                         arch_tag=None, user=None, binary_only=True):
         """See IHasBuildRecords."""
+        from lp.soyuz.model.binarypackagebuild import (
+            BUILD_ARCHIVE,
+            decorate_binarypackagebuilds,
+            )
         if binary_only:
-            return getUtility(IBinaryPackageBuildSet).getBuildsForBuilder(
-                self.id, build_state, name, pocket, arch_tag, user)
+            return decorate_binarypackagebuilds(
+                getUtility(IBinaryPackageBuildSet).getBuildsForBuilder(
+                    self.id, build_state, name, pocket, arch_tag, user),
+                archive=BUILD_ARCHIVE)
         else:
             if arch_tag is not None or name is not None or pocket is not None:
                 raise IncompatibleArguments(
 
=== modified file 'lib/lp/registry/model/distribution.py'
--- lib/lp/registry/model/distribution.py	2014-01-07 01:45:40 +0000
+++ lib/lp/registry/model/distribution.py	2014-05-12 07:22:06 +0000
@@ -170,6 +170,7 @@
 from lp.soyuz.interfaces.buildrecords import IHasBuildRecords
 from lp.soyuz.interfaces.publishing import active_publishing_status
 from lp.soyuz.model.archive import Archive
+from lp.soyuz.model.binarypackagebuild import decorate_binarypackagebuilds
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease,
@@ -951,8 +952,9 @@
         # now).
         # The "binary_only" option is not yet supported for
         # IDistribution.
-        return getUtility(IBinaryPackageBuildSet).getBuildsForDistro(
+        bpbs = getUtility(IBinaryPackageBuildSet).getBuildsForDistro(
             self, build_state, name, pocket, arch_tag)
+        return decorate_binarypackagebuilds(bpbs, archive=self.main_archive)
 
     def searchSourcePackageCaches(
         self, text, has_packaging=None, publishing_distroseries=None):
 
=== modified file 'lib/lp/registry/model/distroseries.py'
--- lib/lp/registry/model/distroseries.py	2014-01-06 14:24:05 +0000
+++ lib/lp/registry/model/distroseries.py	2014-05-12 07:22:06 +0000
@@ -135,6 +135,7 @@
 from lp.soyuz.interfaces.sourcepackageformat import (
     ISourcePackageFormatSelectionSet,
     )
+from lp.soyuz.model.binarypackagebuild import decorate_binarypackagebuilds
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.component import Component
 from lp.soyuz.model.distroarchseries import (
@@ -1014,8 +1015,9 @@
         # Ignore "user", since it would not make any difference to the
         # records returned here (private builds are only in PPA right
         # now). We also ignore binary_only and always return binaries.
-        return getUtility(IBinaryPackageBuildSet).getBuildsForDistro(
+        bpbs = getUtility(IBinaryPackageBuildSet).getBuildsForDistro(
             self, build_state, name, pocket, arch_tag)
+        return decorate_binarypackagebuilds(bpbs, archive=self.main_archive)
 
     def createUploadedSourcePackageRelease(
         self, sourcepackagename, version, maintainer, builddepends,
 
=== modified file 'lib/lp/registry/model/sourcepackage.py'
--- lib/lp/registry/model/sourcepackage.py	2013-11-19 02:51:24 +0000
+++ lib/lp/registry/model/sourcepackage.py	2014-05-12 07:22:06 +0000
@@ -75,6 +75,7 @@
 from lp.soyuz.model.binarypackagebuild import (
     BinaryPackageBuild,
     BinaryPackageBuildSet,
+    decorate_binarypackagebuilds,
     )
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease,
@@ -656,8 +657,10 @@
 
         # End of duplication (see XXX cprov 2006-09-25 above).
 
-        return IStore(BinaryPackageBuild).using(clauseTables).find(
+        bpbs = IStore(BinaryPackageBuild).using(clauseTables).find(
             BinaryPackageBuild, *condition_clauses).order_by(*orderBy)
+        return decorate_binarypackagebuilds(
+            bpbs, archive=self.distribution.main_archive)
 
     @property
     def latest_published_component(self):
 
=== modified file 'lib/lp/security.py'
--- lib/lp/security.py	2014-03-17 21:50:33 +0000
+++ lib/lp/security.py	2014-05-12 07:22:06 +0000
@@ -21,6 +21,7 @@
     queryAdapter,
     )
 from zope.interface import Interface
+from zope.security.proxy import removeSecurityProxy
 
 from lp.answers.interfaces.faq import IFAQ
 from lp.answers.interfaces.faqtarget import IFAQTarget
@@ -1874,7 +1875,7 @@
         # user to retry build if so.
         # strict_component is True because the source package already exists,
         # otherwise, how can they give it back?
-        check_perms = self.obj.archive.checkUpload(
+        check_perms = removeSecurityProxy(self.obj.archive).checkUpload(
             user.person, self.obj.distro_series,
             self.obj.source_package_release.sourcepackagename,
             self.obj.current_component, self.obj.pocket,
 
=== modified file 'lib/lp/soyuz/browser/archive.py'
--- lib/lp/soyuz/browser/archive.py	2014-05-06 09:11:14 +0000
+++ lib/lp/soyuz/browser/archive.py	2014-05-12 07:22:06 +0000
@@ -164,6 +164,7 @@
     Archive,
     validate_ppa,
     )
+from lp.soyuz.model.binarypackagebuild import decorate_binarypackagebuilds
 from lp.soyuz.model.publishing import SourcePackagePublishingHistory
 from lp.soyuz.scripts.packagecopier import check_copy_permissions
 
@@ -238,9 +239,14 @@
     @stepthrough('+build')
     def traverse_build(self, name):
         build = get_build_by_id_str(IBinaryPackageBuildSet, name)
-        if build is None or build.archive != self.context:
+        # XXX: This should check whether self.context is build.archive
+        # or has some of the build's binaries published in it.
+        if (build is None
+            or (self.context != build.archive
+                and self.context not in
+                    build.sourcepackagerelease.published_archives)):
             return None
-        return build
+        return decorate_binarypackagebuilds([build], self.context)[0]
 
     @stepthrough('+recipebuild')
     def traverse_recipebuild(self, name):
 
=== modified file 'lib/lp/soyuz/browser/build.py'
--- lib/lp/soyuz/browser/build.py	2014-05-06 09:11:14 +0000
+++ lib/lp/soyuz/browser/build.py	2014-05-12 07:22:06 +0000
@@ -131,6 +131,42 @@
         return u"+build/%d" % self.context.id
 
 
+class ArchiveBuildUrl:
+    """Dynamic URL declaration for IArchiveBinaryPackageBuild.
+
+    When dealing with primary and partner builds we want to present them
+    under their archive's distribution's IDistributionSourcePackageRelease:
+
+       /ubuntu/+source/foo/1.0/+build/1234
+
+    On the other hand, PPA builds will be presented under the PPA:
+
+       /~cprov/+archive/+build/1235
+
+    And copy archives will be presented under the archive:
+
+       /ubuntu/+archive/my-special-archive/+build/1234
+    """
+    implements(ICanonicalUrlData)
+    rootsite = None
+
+    def __init__(self, context):
+        self.context = context
+
+    @property
+    def inside(self):
+        if self.context.parent_archive.is_main:
+            distro = self.context.parent_archive.distribution
+            return distro.getSourcePackageRelease(
+                self.context.source_package_release)
+        else:
+            return self.context.parent_archive
+
+    @property
+    def path(self):
+        return u"+build/%d" % self.context.id
+
+
 class BuildNavigation(GetitemNavigation, FileNavigationMixin):
     usedfor = IBinaryPackageBuild
 
 
=== modified file 'lib/lp/soyuz/browser/configure.zcml'
--- lib/lp/soyuz/browser/configure.zcml	2014-04-24 07:30:36 +0000
+++ lib/lp/soyuz/browser/configure.zcml	2014-05-12 07:22:06 +0000
@@ -338,6 +338,9 @@
     <browser:url
         for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
         urldata="lp.soyuz.browser.build.BuildUrl"/>
+    <browser:url
+        for="lp.soyuz.interfaces.binarypackagebuild.IArchiveBinaryPackageBuild"
+        urldata="lp.soyuz.browser.build.ArchiveBuildUrl"/>
     <browser:navigation
         module="lp.soyuz.browser.build"
         classes="
 
=== modified file 'lib/lp/soyuz/browser/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2014-05-06 09:11:14 +0000
+++ lib/lp/soyuz/browser/distributionsourcepackagerelease.py	2014-05-12 07:22:06 +0000
@@ -32,6 +32,7 @@
 from lp.soyuz.interfaces.distributionsourcepackagerelease import (
     IDistributionSourcePackageRelease,
     )
+from lp.soyuz.model.binarypackagebuild import decorate_binarypackagebuilds
 
 
 class DistributionSourcePackageReleaseBreadcrumb(Breadcrumb):
@@ -48,13 +49,18 @@
     @stepthrough('+build')
     def traverse_build(self, name):
         build = get_build_by_id_str(IBinaryPackageBuildSet, name)
+        # XXX: This should check whether any of all_distro_archives is
+        # build.archive, or any of them contain the build's binaries.
         if (build is None
-            or build.archive not in
-                self.context.distribution.all_distro_archives
+            or (build.archive not in
+                    self.context.distribution.all_distro_archives
+                and self.context.distribution.main_archive not in
+                    build.sourcepackagerelease.published_archives)
             or build.source_package_release !=
                 self.context.sourcepackagerelease):
             return None
-        return build
+        return decorate_binarypackagebuilds(
+            [build], archive=self.context.distribution.main_archive)[0]
 
 
 class DistributionSourcePackageReleaseView(LaunchpadView):
 
=== modified file 'lib/lp/soyuz/configure.zcml'
--- lib/lp/soyuz/configure.zcml	2014-02-18 11:40:52 +0000
+++ lib/lp/soyuz/configure.zcml	2014-05-12 07:22:06 +0000
@@ -491,6 +491,19 @@
             permission="launchpad.Admin"
             interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildAdmin"/>
     </class>
+    <class
+        class="lp.soyuz.model.binarypackagebuild.ArchiveBinaryPackageBuild">
+        <require
+            permission="launchpad.View"
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildView"
+            attributes="parent_archive build" />
+        <require
+            permission="launchpad.Edit"
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildEdit"/>
+        <require
+            permission="launchpad.Admin"
+            interface="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuildAdmin"/>
+    </class>
     <adapter
         provides="lp.services.webapp.interfaces.IBreadcrumb"
         for="lp.soyuz.interfaces.binarypackagebuild.IBinaryPackageBuild"
 
=== modified file 'lib/lp/soyuz/interfaces/binarypackagebuild.py'
--- lib/lp/soyuz/interfaces/binarypackagebuild.py	2013-11-26 01:36:10 +0000
+++ lib/lp/soyuz/interfaces/binarypackagebuild.py	2014-05-12 07:22:06 +0000
@@ -8,6 +8,7 @@
 __all__ = [
     'BuildSetStatus',
     'CannotBeRescored',
+    'IArchiveBinaryPackageBuild',
     'IBinaryPackageBuild',
     'IBuildRescoreForm',
     'IBinaryPackageBuildSet',
@@ -261,6 +262,25 @@
     export_as_webservice_entry(singular_name='build', plural_name='builds')
 
 
+class IArchiveBinaryPackageBuild(IBinaryPackageBuild):
+    """A build in an archive.
+
+    `Archive`s need to be self-contained, for reasons of access control,
+    federation, deletion, and more. Since `BinaryPackageBuild`s produce
+    `BinaryPackageRelease`s that can be copied between archives, a
+    `BinaryPackageBuild` has no single archive parent -- they, like
+    `BinaryPackageRelease`s and `SourcePackageRelease`s, are
+    contextless.
+
+    `ArchiveBinaryPackageBuild` is a virtual class combining a
+    `BinaryPackageBuild` with an `Archive` as its parent, giving it a
+    URL. An `ArchiveBinaryPackageBuild` should be returned whenever
+    there is an obvious `Archive` context.
+    """
+    parent_archive = Attribute("Parent archive")
+    build = Attribute("BinaryPackageBuild")
+
+
 class BuildSetStatus(EnumeratedType):
     """`IBuildSet` status type
 
 
=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2014-04-23 14:24:15 +0000
+++ lib/lp/soyuz/model/archive.py	2014-05-12 07:22:06 +0000
@@ -180,7 +180,10 @@
 from lp.soyuz.model.archiveauthtoken import ArchiveAuthToken
 from lp.soyuz.model.archivedependency import ArchiveDependency
 from lp.soyuz.model.archivepermission import ArchivePermission
-from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
+from lp.soyuz.model.binarypackagebuild import (
+    BinaryPackageBuild,
+    decorate_binarypackagebuilds,
+    )
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import (
     BinaryPackageRelease,
@@ -483,8 +486,9 @@
         # will implicitly have permission to see it.
 
         if binary_only:
-            return getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
+            bpbs = getUtility(IBinaryPackageBuildSet).getBuildsForArchive(
                 self, build_state, name, pocket, arch_tag)
+            return decorate_binarypackagebuilds(bpbs, archive=self)
         else:
             if arch_tag is not None or name is not None or pocket is not None:
                 raise IncompatibleArguments(
 
=== modified file 'lib/lp/soyuz/model/binarypackagebuild.py'
--- lib/lp/soyuz/model/binarypackagebuild.py	2013-12-04 07:07:04 +0000
+++ lib/lp/soyuz/model/binarypackagebuild.py	2014-05-12 07:22:06 +0000
@@ -5,7 +5,9 @@
 __all__ = [
     'BinaryPackageBuild',
     'BinaryPackageBuildSet',
+    'BUILD_ARCHIVE',
     'COPY_ARCHIVE_SCORE_PENALTY',
+    'decorate_binarypackagebuilds',
     'PRIVATE_ARCHIVE_SCORE_BONUS',
     'SCORE_BY_COMPONENT',
     'SCORE_BY_POCKET',
@@ -16,6 +18,7 @@
 from operator import itemgetter
 
 import apt_pkg
+from lazr.delegates import delegates
 import pytz
 from sqlobject import SQLObjectNotFound
 from storm.expr import (
@@ -92,6 +95,7 @@
 from lp.soyuz.interfaces.binarypackagebuild import (
     BuildSetStatus,
     CannotBeRescored,
+    IArchiveBinaryPackageBuild,
     IBinaryPackageBuild,
     IBinaryPackageBuildSet,
     UnparsableDependencies,
@@ -144,6 +148,46 @@
 COPY_ARCHIVE_SCORE_PENALTY = 2600
 
 
+BUILD_ARCHIVE = object()
+
+
+def decorate_binarypackagebuilds(bpbs, archive=None):
+    """Decorate `BinaryPackageBuild`s into `ArchiveBinaryPackageBuild`s.
+
+    Three types of input are supported, depending on the value of archive:
+
+      - archive=None: bpbs is a sequence of (build, archive) pairs
+
+      - archive=BUILD_ARCHIVE: bpbs is a sequence of builds, each of
+        which will be decorated with the archive in which it was built.
+
+      - archive=<some archive>: bpbs is a sequence of builds, each of
+        which will be decoreated with the given archive.
+
+    If bpbs is an IResultSet, the return value will be a DecoratedResultSet.
+    If it's a list or tuple, the return value will be a list.
+    Otherwise, the return value will be a generator.
+    """
+    if archive is None:
+        splitter = lambda build: (build[1], build[0])
+    elif archive is BUILD_ARCHIVE:
+        splitter = lambda build: (build.archive, build)
+    else:
+        splitter = lambda build: (archive, build)
+
+    if IResultSet.providedBy(bpbs):
+        return DecoratedResultSet(
+            bpbs,
+            lambda build: ArchiveBinaryPackageBuild(*splitter(build)))
+    else:
+        seq = (
+            ArchiveBinaryPackageBuild(*splitter(build))
+            for build in bpbs)
+        if isinstance(bpbs, (list, tuple)):
+            seq = list(seq)
+        return seq
+
+
 class BinaryPackageBuild(PackageBuildMixin, SQLBase):
     implements(IBinaryPackageBuild)
     _table = 'BinaryPackageBuild'
@@ -887,6 +931,25 @@
         return changes.signer
 
 
+class ArchiveBinaryPackageBuild:
+
+    implements(IArchiveBinaryPackageBuild)
+    delegates(IBinaryPackageBuild, 'build')
+
+    def __init__(self, parent_archive, build):
+        self.parent_archive = parent_archive
+        self.build = build
+
+    def __eq__(self, other):
+        return (
+            isinstance(other, self.__class__)
+            and self.parent_archive == other.parent_archive
+            and self.build == other.build)
+
+    def __ne__(self, other):
+        return not self.__eq__(other)
+
+
 class BinaryPackageBuildSet(SpecificBuildFarmJobSourceMixin):
     implements(IBinaryPackageBuildSet)
 
 
=== modified file 'lib/lp/soyuz/model/distributionsourcepackagerelease.py'
--- lib/lp/soyuz/model/distributionsourcepackagerelease.py	2014-01-13 07:09:40 +0000
+++ lib/lp/soyuz/model/distributionsourcepackagerelease.py	2014-05-12 07:22:06 +0000
@@ -28,7 +28,10 @@
     )
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
 from lp.soyuz.model.archive import Archive
-from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
+from lp.soyuz.model.binarypackagebuild import (
+    BinaryPackageBuild,
+    decorate_binarypackagebuilds,
+    )
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.soyuz.model.distroseriesbinarypackage import DistroSeriesBinaryPackage
@@ -125,9 +128,11 @@
             Archive.purpose.is_in(MAIN_ARCHIVE_PURPOSES)).config(
                 distinct=True)
 
-        return builds_built_in_main_archives.union(
+        result = builds_built_in_main_archives.union(
             builds_published_in_main_archives).order_by(
                 Desc(BinaryPackageBuild.id))
+        return decorate_binarypackagebuilds(
+            result, archive=self.distribution.main_archive)
 
     @property
     def binary_package_names(self):
 
=== modified file 'lib/lp/soyuz/model/distroarchseries.py'
--- lib/lp/soyuz/model/distroarchseries.py	2014-02-28 11:12:31 +0000
+++ lib/lp/soyuz/model/distroarchseries.py	2014-05-12 07:22:06 +0000
@@ -266,6 +266,9 @@
         # now).
         # Ignore "binary_only" as for a distro arch series it is only
         # the binaries that are relevant.
+        from lp.soyuz.model.binarypackagebuild import (
+            decorate_binarypackagebuilds,
+            )
 
         # For consistency we return an empty resultset if arch_tag
         # is provided but doesn't match our architecture.
@@ -274,8 +277,9 @@
 
         # Use the facility provided by IBinaryPackageBuildSet to
         # retrieve the records.
-        return getUtility(IBinaryPackageBuildSet).getBuildsForDistro(
+        bpbs = getUtility(IBinaryPackageBuildSet).getBuildsForDistro(
             self, build_state, name, pocket)
+        return decorate_binarypackagebuilds(bpbs, archive=self.main_archive)
 
     def getReleasedPackages(self, binary_name, pocket=None,
                             include_pending=False, archive=None):
 
=== modified file 'lib/lp/soyuz/model/distroarchseriesbinarypackagerelease.py'
--- lib/lp/soyuz/model/distroarchseriesbinarypackagerelease.py	2013-01-21 16:27:29 +0000
+++ lib/lp/soyuz/model/distroarchseriesbinarypackagerelease.py	2014-05-12 07:22:06 +0000
@@ -17,6 +17,7 @@
     IDistroArchSeriesBinaryPackageRelease,
     )
 from lp.soyuz.interfaces.publishing import active_publishing_status
+from lp.soyuz.model.binarypackagebuild import decorate_binarypackagebuilds
 from lp.soyuz.model.distributionsourcepackagerelease import (
     DistributionSourcePackageRelease,
     )
@@ -185,7 +186,9 @@
     @property
     def build(self):
         """See `IBinaryPackageRelease`."""
-        return self.binarypackagerelease.build
+        return decorate_binarypackagebuilds(
+            [self.binarypackagerelease.build],
+            archive=self.distribution.main_archive)[0]
 
     @property
     def binpackageformat(self):
 
=== modified file 'lib/lp/soyuz/model/distroseriessourcepackagerelease.py'
--- lib/lp/soyuz/model/distroseriessourcepackagerelease.py	2013-01-07 02:40:55 +0000
+++ lib/lp/soyuz/model/distroseriessourcepackagerelease.py	2014-05-12 07:22:06 +0000
@@ -26,7 +26,10 @@
     IDistroSeriesSourcePackageRelease,
     )
 from lp.soyuz.interfaces.sourcepackagerelease import ISourcePackageRelease
-from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
+from lp.soyuz.model.binarypackagebuild import (
+    BinaryPackageBuild,
+    decorate_binarypackagebuilds,
+    )
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import BinaryPackageRelease
 from lp.soyuz.model.publishing import (
@@ -119,9 +122,10 @@
             self.distroseries.distribution,
             self.sourcepackagerelease).builds
 
-        return (
+        return decorate_binarypackagebuilds(
             [build for build in distro_builds
-             if build.distro_arch_series.distroseries == self.distroseries])
+             if build.distro_arch_series.distroseries == self.distroseries],
+            archive=self.distribution.main_archive)
 
     @property
     def files(self):
 
=== modified file 'lib/lp/soyuz/model/publishing.py'
--- lib/lp/soyuz/model/publishing.py	2014-05-06 06:32:46 +0000
+++ lib/lp/soyuz/model/publishing.py	2014-05-12 07:22:06 +0000
@@ -17,10 +17,7 @@
 
 from collections import defaultdict
 from datetime import datetime
-from operator import (
-    attrgetter,
-    itemgetter,
-    )
+from operator import attrgetter
 import os
 import re
 import sys
@@ -58,7 +55,6 @@
 from lp.services.database import bulk
 from lp.services.database.constants import UTC_NOW
 from lp.services.database.datetimecol import UtcDateTimeCol
-from lp.services.database.decoratedresultset import DecoratedResultSet
 from lp.services.database.enumcol import EnumCol
 from lp.services.database.interfaces import (
     IMasterStore,
@@ -110,7 +106,10 @@
     )
 from lp.soyuz.interfaces.queue import QueueInconsistentStateError
 from lp.soyuz.interfaces.section import ISectionSet
-from lp.soyuz.model.binarypackagebuild import BinaryPackageBuild
+from lp.soyuz.model.binarypackagebuild import (
+    BinaryPackageBuild,
+    decorate_binarypackagebuilds,
+    )
 from lp.soyuz.model.binarypackagename import BinaryPackageName
 from lp.soyuz.model.binarypackagerelease import (
     BinaryPackageRelease,
@@ -540,7 +539,8 @@
     @staticmethod
     def _convertBuilds(builds_for_sources):
         """Convert from IPublishingSet getBuilds to SPPH getBuilds."""
-        return [build[1] for build in builds_for_sources]
+        return decorate_binarypackagebuilds(
+            [(build[1], build[0].archive) for build in builds_for_sources])
 
     def getBuilds(self):
         """See `ISourcePackagePublishingHistory`."""
@@ -1892,6 +1892,8 @@
             # Thank you, Zope, for security wrapping an abstract data
             # structure.
             summary = removeSecurityProxy(summary)
+            summary['builds'] = decorate_binarypackagebuilds(
+                summary['builds'], archive=archive)
             summary['date_published'] = source_pub.datepublished
             summary['source_package_name'] = source_pub.source_package_name
             source_build_statuses[source_pub.id] = summary
@@ -1918,7 +1920,8 @@
             for source_pub, builds in unpublished_per_source.items():
                 summary = {
                     'status': BuildSetStatus.FULLYBUILT_PENDING,
-                    'builds': builds,
+                    'builds': decorate_binarypackagebuilds(
+                        builds, archive=archive),
                     'date_published': source_pub.datepublished,
                     'source_package_name': source_pub.source_package_name,
                 }
 
=== modified file 'lib/lp/soyuz/model/queue.py'
--- lib/lp/soyuz/model/queue.py	2014-04-09 12:32:50 +0000
+++ lib/lp/soyuz/model/queue.py	2014-05-12 07:22:06 +0000
@@ -234,10 +234,15 @@
 
     def binaryFileUrls(self):
         """See `IPackageUpload`."""
+        from lp.soyuz.model.binarypackagebuild import (
+            decorate_binarypackagebuilds,
+            )
+        bpbs = [build.build for build in self.builds]
         return [
-            ProxiedLibraryFileAlias(file.libraryfile, build.build).http_url
-            for build in self.builds
-            for bpr in build.build.binarypackages
+            ProxiedLibraryFileAlias(file.libraryfile, abpb).http_url
+            for abpb in decorate_binarypackagebuilds(
+                bpbs, archive=self.archive)
+            for bpr in abpb.binarypackages
             for file in bpr.files]
 
     @property
 
=== modified file 'lib/lp/soyuz/scripts/tests/test_copypackage.py'
--- lib/lp/soyuz/scripts/tests/test_copypackage.py	2013-09-11 08:17:34 +0000
+++ lib/lp/soyuz/scripts/tests/test_copypackage.py	2014-05-12 07:22:06 +0000
@@ -1710,7 +1710,9 @@
     def test_copy_source_and_binaries_from_ppa_does_not_create_builds(self):
         # Copying a source package and its binaries from a PPA to the
         # primary archive copies the binaries and does not create any new
-        # build records.
+        # build records. The ArchiveBinaryPackageBuilds returned by
+        # getBuilds() are distinct, but they wrap the same
+        # BinaryPackageBuilds.
         source = self.test_publisher.getPubSource(archive=self.ppa)
         self.test_publisher.getPubBinaries(pub_source=source)
         self.layer.txn.commit()
@@ -1726,7 +1728,9 @@
             "%s %s in %s" % (spr.name, spr.version, self.series.name),
             copied[0].displayname)
         self.assertEqual(2, len(copied[0].getPublishedBinaries()))
-        self.assertEqual(initial_builds, copied[0].getBuilds())
+        self.assertEqual(
+            [abpb.build for abpb in initial_builds],
+            [abpb.build for abpb in copied[0].getBuilds()])
 
     def makeSeriesWithExtraArchitecture(self):
         """Make a new distroseries with an additional architecture."""
 
=== modified file 'lib/lp/soyuz/stories/soyuz/xx-private-builds.txt'
--- lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2013-12-03 05:18:41 +0000
+++ lib/lp/soyuz/stories/soyuz/xx-private-builds.txt	2014-05-12 07:22:06 +0000
@@ -329,7 +329,9 @@
     i386 build of privacy-test 666 : PPA named p3a for Celso Providelo : Celso Providelo
 
 When accessing the distroseries source package release page, the builds
-portlet will display a link to the newly unembargoed build:
+portlet will display a link to the newly unembargoed build. It's the
+same build as the PPA, with the same ID, but structurally under the
+primary archive:
 
     >>> browser.open(
     ...     "http://launchpad.dev/ubuntutest/breezy-autotest/"
@@ -340,7 +342,7 @@
     breezy-autotest i386 Successfully built
 
     >>> print browser.getLink('i386').url
-    http://launchpad.dev/~cprov/+archive/p3a/+build/...
+    http://launchpad.dev/ubuntutest/+source/privacy-test/666/+build/...
 
 Similarly, when accessing the distribution source package release page,
 the main content will display a link to the newly unembargoed build:
@@ -353,4 +355,4 @@
     Breezy Badger Autotest: i386
 
     >>> print browser.getLink('i386').url
-    http://launchpad.dev/~cprov/+archive/p3a/+build/...
+    http://launchpad.dev/ubuntutest/+source/privacy-test/666/+build/...
 
=== modified file 'lib/lp/soyuz/tests/test_hasbuildrecords.py'
--- lib/lp/soyuz/tests/test_hasbuildrecords.py	2013-11-28 08:51:32 +0000
+++ lib/lp/soyuz/tests/test_hasbuildrecords.py	2014-05-12 07:22:06 +0000
@@ -56,7 +56,7 @@
 
     def test_getBuildRecords_no_archs(self):
         # getBuildRecords() called without any arguments returns all builds.
-        builds = self.context.getBuildRecords()
+        builds = [abpb.build for abpb in self.context.getBuildRecords()]
         self.assertContentEqual(builds, self.builds)
 
     def test_getBuildRecords_by_arch_tag(self):
@@ -65,7 +65,9 @@
         # Target one of the builds to hppa so that we have three builds
         # in total, two of which are i386 and one hppa.
         i386_builds = self.builds[:2]
-        builds = self.context.getBuildRecords(arch_tag="i386")
+        builds = [
+            abpb.build
+            for abpb in self.context.getBuildRecords(arch_tag="i386")]
         self.assertContentEqual(i386_builds, builds)
 
 
@@ -295,7 +297,7 @@
         build2.queueBuild()
         build1.buildqueue_record.lastscore = 10
         build2.buildqueue_record.lastscore = 1000
-        builds = list(source_package.getBuildRecords())
+        builds = [abpb.build for abpb in source_package.getBuildRecords()]
         self.assertEquals([build2, build1], builds)
 
     def test_copy_archive_without_leak(self):
@@ -328,7 +330,7 @@
             distroseries, PackagePublishingPocket.RELEASE, copy)
         [copy_build] = copy_spph.createMissingBuilds()
         builds = copy.getBuildRecords()
-        self.assertEquals([copy_build], list(builds))
+        self.assertEquals([copy_build], [abpb.build for abpb in builds])
         source = SourcePackage(spn, spph.distroseries)
         # SourcePackage.getBuildRecords() doesn't have two build records.
         builds = source.getBuildRecords().count()
 
=== modified file 'lib/lp/soyuz/tests/test_packageupload.py'
--- lib/lp/soyuz/tests/test_packageupload.py	2014-04-09 12:32:50 +0000
+++ lib/lp/soyuz/tests/test_packageupload.py	2014-05-12 07:22:06 +0000
@@ -47,6 +47,7 @@
     QueueInconsistentStateError,
     )
 from lp.soyuz.interfaces.section import ISectionSet
+from lp.soyuz.model.binarypackagebuild import ArchiveBinaryPackageBuild
 from lp.soyuz.model.packagecopyjob import IPackageCopyJobSource
 from lp.soyuz.tests.test_publishing import SoyuzTestPublisher
 from lp.testing import (
@@ -1125,7 +1126,10 @@
         self.assertNotEqual(0, len(ws_binary_file_urls))
         with person_logged_in(person):
             binary_file_urls = [
-                ProxiedLibraryFileAlias(file.libraryfile, build.build).http_url
+                ProxiedLibraryFileAlias(
+                    file.libraryfile,
+                    ArchiveBinaryPackageBuild(
+                        self.distroseries.main_archive, build.build)).http_url
                 for build in upload.builds
                 for bpr in build.build.binarypackages
                 for file in bpr.files]