diff options
| author | Nicolas Vigier <boklm@mageia.org> | 2013-05-30 19:56:08 +0000 |
|---|---|---|
| committer | Nicolas Vigier <boklm@mageia.org> | 2013-05-30 19:56:08 +0000 |
| commit | 28f26029523f99801a2cd66d904195ed923f63f1 (patch) | |
| tree | 0b968ee48c42cd97ef1f3735fc32d9de82bb5f3e | |
| parent | 74100016adbac43531769ce94419fc9fb1affcae (diff) | |
| download | puppet-28f26029523f99801a2cd66d904195ed923f63f1.tar puppet-28f26029523f99801a2cd66d904195ed923f63f1.tar.gz puppet-28f26029523f99801a2cd66d904195ed923f63f1.tar.bz2 puppet-28f26029523f99801a2cd66d904195ed923f63f1.tar.xz puppet-28f26029523f99801a2cd66d904195ed923f63f1.zip | |
buildsystem/templates/media.cfg: hdlists -> hdlist
| -rw-r--r-- | modules/buildsystem/templates/media.cfg | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg index 203e5ebf..1ed45e23 100644 --- a/modules/buildsystem/templates/media.cfg +++ b/modules/buildsystem/templates/media.cfg @@ -54,7 +54,7 @@ distro['medias'].keys.sort { |x,y| distro['medias'][x]['order'] <=> distro['medi end -%><%= media_out [ medianame, reponame ].join('/'), - :hdlists => [ 'hdlist', medianame, reponame ].join('_') + '.cz', + :hdlist => [ 'hdlist', medianame, reponame ].join('_') + '.cz', :name => media_name(medianame, reponame, nil, nil), :srpms => [ '../../SRPMS', medianame, reponame ].join('/'), :media_type => media_type.join(':'), @@ -68,7 +68,7 @@ distro['medias'].keys.sort { |x,y| distro['medias'][x]['order'] <=> distro['medi debug_media_type = media_type + [ 'debug' ] -%><%= media_out [ 'debug', medianame, reponame ].join('/'), - :hdlists => [ 'hdlist_debug', medianame, reponame ].join('_') + '.cz', + :hdlist => [ 'hdlist_debug', medianame, reponame ].join('_') + '.cz', :name => media_name(medianame, reponame, 'debug', nil), :srpms => [ '../../SRPMS', medianame, reponame ].join('/'), :media_type => debug_media_type.join(':'), @@ -81,7 +81,7 @@ distro['medias'].keys.sort { |x,y| distro['medias'][x]['order'] <=> distro['medi source_media_type = media_type + [ 'source' ] -%><%= media_out [ '../../SRPMS', medianame, reponame ].join('/'), - :hdlists => [ 'hdlist', medianame, reponame ].join('_') + '.src.cz', + :hdlist => [ 'hdlist', medianame, reponame ].join('_') + '.src.cz', :name => media_name(medianame, reponame, 'sources', nil), :rpms => [ medianame, reponame ].join('/'), :media_type => source_media_type.join(':'), @@ -95,7 +95,7 @@ distro['medias'].keys.sort { |x,y| distro['medias'][x]['order'] <=> distro['medi medianame32 = [ medianame, '32' ].join('') -%><%= media_out [ '../../i586/media', medianame, reponame ].join('/'), - :hdlists => [ 'hdlist', medianame32, reponame ].join('_') + '.src.cz', + :hdlist => [ 'hdlist', medianame32, reponame ].join('_') + '.src.cz', :name => media_name(medianame, reponame, nil, '32bit'), :media_type => media_type.join(':'), :media_types => media_type.join(':'), @@ -114,7 +114,7 @@ if distro['based_on'] != nil for reponame in media -%><%= media_out [ bdistroname, medianame, reponame ].join('/'), - :hdlists => [ 'hdlist', bdistroname, medianame, + :hdlist => [ 'hdlist', bdistroname, medianame, reponame ].join('_'), :name => media_name([ medianame, bdistroname].join(''), reponame, nil, nil), :media_type => 'base_distro', |