diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-29 21:21:52 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-29 21:21:52 +0000 |
| commit | 630824f1137eec2b42291952ad00739239a17121 (patch) | |
| tree | 4faafc736fa3cf60aa1bf77191500549ee2c9412 | |
| parent | 870daca3906576f795d3cbbf54ecd5ca49c91336 (diff) | |
| download | puppet-630824f1137eec2b42291952ad00739239a17121.tar puppet-630824f1137eec2b42291952ad00739239a17121.tar.gz puppet-630824f1137eec2b42291952ad00739239a17121.tar.bz2 puppet-630824f1137eec2b42291952ad00739239a17121.tar.xz puppet-630824f1137eec2b42291952ad00739239a17121.zip | |
media.cfg: add both media_type and media_types
Temporary fix, while we have two versions of urpmi using different
values :
https://bugs.mageia.org/show_bug.cgi?id=10335#c8
| -rw-r--r-- | modules/buildsystem/templates/media.cfg | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg index 2635027d..fb4e0680 100644 --- a/modules/buildsystem/templates/media.cfg +++ b/modules/buildsystem/templates/media.cfg @@ -58,6 +58,7 @@ distro['medias'].keys.sort.each{|medianame| :name => media_name(medianame, reponame, nil, nil), :srpms => [ '../../SRPMS', medianame, reponame ].join('/'), :media_type => media_type.join(':'), + :media_types => media_type.join(':'), :updates_for => updates_for, :noauto => noauto @@ -71,6 +72,7 @@ distro['medias'].keys.sort.each{|medianame| :name => media_name(medianame, reponame, 'debug', nil), :srpms => [ '../../SRPMS', medianame, reponame ].join('/'), :media_type => debug_media_type.join(':'), + :media_types => debug_media_type.join(':'), :noauto => '1' %> @@ -83,6 +85,7 @@ distro['medias'].keys.sort.each{|medianame| :name => media_name(medianame, reponame, 'sources', nil), :rpms => [ medianame, reponame ].join('/'), :media_type => source_media_type.join(':'), + :media_types => source_media_type.join(':'), :noauto => '1' %> @@ -95,6 +98,7 @@ distro['medias'].keys.sort.each{|medianame| :hdlists => [ 'hdlist', medianame32, reponame ].join('_') + '.src.cz', :name => media_name(medianame, reponame, nil, '32bit'), :media_type => media_type.join(':'), + :media_types => media_type.join(':'), :noauto => noauto %> @@ -114,6 +118,7 @@ if distro['based_on'] != nil reponame ].join('_'), :name => media_name([ medianame, bdistroname].join(''), reponame, nil, nil), :media_type => 'base_distro', + :media_types => 'base_distro', :noauto => 1 %> <%- |