launchpad-reviewers team mailing list archive

[Colin Watson <cjwatson@xxxxxxxxxxxxx>]

Diff comments:

> 
> === modified file 'lib/lp/soyuz/model/livefsbuildbehaviour.py'
> --- lib/lp/soyuz/model/livefsbuildbehaviour.py	2018-03-01 17:36:31 +0000
> +++ lib/lp/soyuz/model/livefsbuildbehaviour.py	2018-05-02 13:37:24 +0000
> @@ -76,33 +77,26 @@
>                  "Missing chroot for %s" % build.distro_arch_series.displayname)
>  
>      @defer.inlineCallbacks
> -    def _extraBuildArgs(self, logger=None):
> +    def extraBuildArgs(self, logger=None):
>          """
>          Return the extra arguments required by the slave for the given build.
>          """
>          build = self.build
> +        args = yield super(LiveFSBuildBehaviour, self).extraBuildArgs(
> +            logger=logger)
>          # Non-trivial metadata values may have been security-wrapped, which
>          # is pointless here and just gets in the way of xmlrpclib
>          # serialisation.
> -        args = dict(removeSecurityProxy(build.livefs.metadata))
> +        args.update(removeSecurityProxy(build.livefs.metadata))

Mm, good point; it's worth avoiding all the same.  I've rearranged things a little so that the base arguments always win.

>          if build.metadata_override is not None:
>              args.update(removeSecurityProxy(build.metadata_override))
> -        args["series"] = build.distro_series.name
>          args["pocket"] = build.pocket.name.lower()
> -        args["arch_tag"] = build.distro_arch_series.architecturetag
>          args["datestamp"] = build.version
>          args["archives"], args["trusted_keys"] = (
>              yield get_sources_list_for_building(
>                  build, build.distro_arch_series, None, logger=logger))
> -        args["archive_private"] = build.archive.private
> -        args["build_url"] = canonical_url(build)
>          defer.returnValue(args)
>  
> -    @defer.inlineCallbacks
> -    def composeBuildRequest(self, logger):
> -        args = yield self._extraBuildArgs(logger=logger)
> -        defer.returnValue(("livefs", self.build.distro_arch_series, {}, args))
> -
>      def verifySuccessfulBuild(self):
>          """See `IBuildFarmJobBehaviour`."""
>          # The implementation in BuildFarmJobBehaviourBase checks whether the


-- 
https://code.launchpad.net/~cjwatson/launchpad/build-fast-cleanup/+merge/344958
Your team Launchpad code reviewers is subscribed to branch lp:launchpad.