aboutsummaryrefslogtreecommitdiffstats
path: root/modules
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:08:01 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:08:01 +0000
commit71e2318d6488b62602ff23e5fb4fd1547a6cbfa9 (patch)
treeadfd290dfdccfb25ff161693fdec4c126f47254a /modules
parente15b788e8f9d66b70f142eb26f3af68dce67e514 (diff)
downloadpuppet-71e2318d6488b62602ff23e5fb4fd1547a6cbfa9.tar
puppet-71e2318d6488b62602ff23e5fb4fd1547a6cbfa9.tar.gz
puppet-71e2318d6488b62602ff23e5fb4fd1547a6cbfa9.tar.bz2
puppet-71e2318d6488b62602ff23e5fb4fd1547a6cbfa9.tar.xz
puppet-71e2318d6488b62602ff23e5fb4fd1547a6cbfa9.zip
buildsystem/media.cfg: don't add non-existend medias
Don't add i586 medias on x86_64 in media.cfg, if the distro does not have i586 medias.
Diffstat (limited to 'modules')
-rw-r--r--modules/buildsystem/templates/media.cfg2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg
index bdd5d813..85c3851e 100644
--- a/modules/buildsystem/templates/media.cfg
+++ b/modules/buildsystem/templates/media.cfg
@@ -88,7 +88,7 @@ distro['medias'].keys.sort.each{|medianame|
%>
<%-# we add 32bit media if arch is x86_64 -%>
<%-
- if @arch == 'x86_64'
+ if @arch == 'x86_64' and distro['arch'].include?('i586')
medianame32 = [ medianame, '32' ].join('')
-%><%=
media_out [ '../../i586/media', medianame, reponame ].join('/'),