-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
+1
On 09/24/2014 12:24 PM, Dennis Gilmore wrote:
Ack looks good
On Wed, 24 Sep 2014 12:12:27 -0400 Mike McLean <mikem(a)redhat.com>
wrote:
> From 3461af8475575d81e32973a2d46d483bf44fc5cb Mon Sep 17 00:00:00
> 2001 From: Mike McLean <mikem(a)redhat.com> Date: Wed, 24 Sep 2014
> 10:10:17 -0400 Subject: [PATCH] sanity check requested arches for
> image builds
> --- builder/kojid | 23 +++++++++++++++++++++++ 1 file changed, 23
> insertions(+)
> diff --git a/builder/kojid b/builder/kojid index bdc3b9b..c71637d
> 100755 --- a/builder/kojid +++ b/builder/kojid @@ -2048,6
> +2048,14 @@ class BuildBaseImageTask(BuildImageTask): target_info
> = self.session.getBuildTarget(target, strict=True) build_tag =
> target_info['build_tag'] repo_info = self.getRepo(build_tag) +
> #check requested arches against build tag + buildconfig =
> self.session.getBuildConfig(build_tag) + if not
> buildconfig['arches']: + raise koji.BuildError, "No
> arches for tag %(name)s [%(id)s]" % buildconfig +
> tag_archlist = [koji.canonArch(a) for a in
> buildconfig['arches'].split()] + for arch in arches: +
> if koji.canonArch(arch) not in tag_archlist: +
> raise koji.BuildError, "Invalid arch for build tag: %s" % arch if
> not opts: opts = {} @@ -2153,6 +2161,14 @@ class
> BuildApplianceTask(BuildImageTask): target_info =
> self.session.getBuildTarget(target, strict=True) build_tag =
> target_info['build_tag'] repo_info = self.getRepo(build_tag) +
> #check requested arch against build tag + buildconfig =
> self.session.getBuildConfig(build_tag) + if not
> buildconfig['arches']: + raise koji.BuildError, "No
> arches for tag %(name)s [%(id)s]" % buildconfig +
> tag_archlist = [koji.canonArch(a) for a in
> buildconfig['arches'].split()] + if koji.canonArch(arch)
> not in tag_archlist: + raise koji.BuildError, "Invalid
> arch for build tag: %s" % arch +
> if not opts: opts = {} @@ -2231,6 +2247,13 @@ class
> BuildLiveCDTask(BuildImageTask): target_info =
> self.session.getBuildTarget(target, strict=True) build_tag =
> target_info['build_tag'] repo_info = self.getRepo(build_tag) +
> #check requested arch against build tag + buildconfig =
> self.session.getBuildConfig(build_tag) + if not
> buildconfig['arches']: + raise koji.BuildError, "No
> arches for tag %(name)s [%(id)s]" % buildconfig +
> tag_archlist = [koji.canonArch(a) for a in
> buildconfig['arches'].split()] + if koji.canonArch(arch)
> not in tag_archlist: + raise koji.BuildError, "Invalid
> arch for build tag: %s" % arch if not opts: opts = {}
-- buildsys mailing list buildsys(a)lists.fedoraproject.org
https://admin.fedoraproject.org/mailman/listinfo/buildsys
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.14 (GNU/Linux)
iQEcBAEBAgAGBQJUIv2KAAoJEMzORChHoQ3axAgH/0cP5sXV2rQsS1qk77YSmV9O
4kb1ZmCbewWGd9IjkkB2eFm5g0VjpRL5AFqO1jGp4SBJXCPaNSWVDakqWLTE5PFK
E4Rbv6Z/JRNAQCea7YjcI/Yv0drKQLgSzafXX3DiM9lu9Jyv48WPPZsunQUdTvHR
fPEk/lNQ4oFySLVKjDJdURdbZwGKqlkCOm3fQFWmz8f4acmXb+lo7HxyyQbGLfw4
HUCIHh1SzTZYq0dDuakBsu1lNDwMlwm2KjVEIjQtAyWEa7fV8mH5L1OJZ/2eFtmv
iM/7pHk84Tk5ab/HwdU9NsMuSDxzZeevqoxgcXnwYMB/Ix6Dom/0EHiWvlxgnc8=
=FCBe
-----END PGP SIGNATURE-----