diff options
| -rw-r--r-- | deployment/mga_buildsystem/manifests/config.pp | 20 | ||||
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 10 | ||||
| -rw-r--r-- | modules/buildsystem/templates/media.cfg | 24 |
3 files changed, 27 insertions, 27 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp index 57dd62b2..8cc68578 100644 --- a/deployment/mga_buildsystem/manifests/config.pp +++ b/deployment/mga_buildsystem/manifests/config.pp @@ -57,26 +57,26 @@ class mga_buildsystem::config { $std_arch = ['i586', 'x86_64'] $std_repos = { 'release' => { - 'media_types' => [ 'release' ], + 'media_type' => [ 'release' ], 'requires' => [], }, 'updates_testing' => { - 'media_types' => [ 'testing' ], + 'media_type' => [ 'testing' ], 'noauto' => '1', 'requires' => [ 'updates' ], }, 'backports_testing' => { - 'media_types' => [ 'testing' ], + 'media_type' => [ 'testing' ], 'noauto' => '1', 'requires' => [ 'backports' ], }, 'backports' => { - 'media_types' => [ 'backports' ], + 'media_type' => [ 'backports' ], 'noauto' => '1', 'requires' => [ 'updates' ], }, 'updates' => { - 'media_types' => [ 'updates' ], + 'media_type' => [ 'updates' ], 'updates_for' => 'release', 'requires' => [ 'release' ], }, @@ -84,17 +84,17 @@ class mga_buildsystem::config { $std_medias = { 'core' => { 'repos' => $std_repos, - 'media_types' => [ 'official', 'free' ], + 'media_type' => [ 'official', 'free' ], }, 'nonfree' => { 'repos' => $std_repos, - 'media_types' => [ 'official' ], + 'media_type' => [ 'official' ], 'noauto' => '1', 'requires' => [ 'core' ], }, 'tainted' => { 'repos' => $std_repos, - 'media_types' => [ 'official' ], + 'media_type' => [ 'official' ], 'noauto' => '1', 'requires' => [ 'core' ], }, @@ -104,11 +104,11 @@ class mga_buildsystem::config { 'infra' => { 'repos' => { 'updates' => { - 'media_types' => [ 'updates' ], + 'media_type' => [ 'updates' ], 'requires' => [ 'release' ], }, }, - 'media_types' => [ 'infra' ], + 'media_type' => [ 'infra' ], 'requires' => [ 'core' ], }, } diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 5640d6e5..4d884de9 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -15,19 +15,19 @@ # 'repos' => { # # the 'release' repo in the 'core' media # 'release' => { -# 'media_types' => [ 'release' ], +# 'media_type' => [ 'release' ], # 'noauto' => '1', # }, # # the 'updates' repo # 'release' => { -# 'media_types' => [ 'updates' ], +# 'media_type' => [ 'updates' ], # 'noauto' => '1', # # the 'updates' repo requires the 'release' repo # 'requires' => [ 'release' ], # }, # }, -# # media_types for media.cfg -# 'media_types' => [ 'official', 'free' ], +# # media_type for media.cfg +# 'media_type' => [ 'official', 'free' ], # # if noauto is set to '1' either in medias or repos, # # the option will be added to media.cfg # 'noauto' => '1', @@ -37,7 +37,7 @@ # 'repos' => { # ... # }, -# 'media_types' => [ 'official', 'non-free' ], +# 'media_type' => [ 'official', 'non-free' ], # # the 'non-free' media requires the 'core' media # 'requires' => [ 'core' ], # } diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg index 96e722af..2635027d 100644 --- a/modules/buildsystem/templates/media.cfg +++ b/modules/buildsystem/templates/media.cfg @@ -37,12 +37,12 @@ distro['medias'].keys.sort.each{|medianame| media = distro['medias'][medianame] media['repos'].keys.sort.each{|reponame| repo = media['repos'][reponame] - media_types = [] - if media['media_types'] != nil - media_types += media['media_types'] + media_type = [] + if media['media_type'] != nil + media_type += media['media_type'] end - if repo['media_types'] != nil - media_types += repo['media_types'] + if repo['media_type'] != nil + media_type += repo['media_type'] end noauto=nil if (media['noauto'] == '1') or (repo['noauto'] == '1') @@ -57,32 +57,32 @@ distro['medias'].keys.sort.each{|medianame| :hdlists => [ 'hdlist', medianame, reponame ].join('_') + '.cz', :name => media_name(medianame, reponame, nil, nil), :srpms => [ '../../SRPMS', medianame, reponame ].join('/'), - :media_types => media_types.join(':'), + :media_type => media_type.join(':'), :updates_for => updates_for, :noauto => noauto %> <%-# debug -%> <%- - debug_media_types = media_types + [ 'debug' ] + debug_media_type = media_type + [ 'debug' ] -%><%= media_out [ 'debug', medianame, reponame ].join('/'), :hdlists => [ 'hdlist_debug', medianame, reponame ].join('_') + '.cz', :name => media_name(medianame, reponame, 'debug', nil), :srpms => [ '../../SRPMS', medianame, reponame ].join('/'), - :media_types => debug_media_types.join(':'), + :media_type => debug_media_type.join(':'), :noauto => '1' %> <%-# source -%> <%- - source_media_types = media_types + [ 'source' ] + source_media_type = media_type + [ 'source' ] -%><%= media_out [ '../../SRPMS', medianame, reponame ].join('/'), :hdlists => [ 'hdlist', medianame, reponame ].join('_') + '.src.cz', :name => media_name(medianame, reponame, 'sources', nil), :rpms => [ medianame, reponame ].join('/'), - :media_types => source_media_types.join(':'), + :media_type => source_media_type.join(':'), :noauto => '1' %> @@ -94,7 +94,7 @@ distro['medias'].keys.sort.each{|medianame| media_out [ '../../i586/media', medianame, reponame ].join('/'), :hdlists => [ 'hdlist', medianame32, reponame ].join('_') + '.src.cz', :name => media_name(medianame, reponame, nil, '32bit'), - :media_types => media_types.join(':'), + :media_type => media_type.join(':'), :noauto => noauto %> @@ -113,7 +113,7 @@ if distro['based_on'] != nil :hdlists => [ 'hdlist', bdistroname, medianame, reponame ].join('_'), :name => media_name([ medianame, bdistroname].join(''), reponame, nil, nil), - :media_types => 'base_distro', + :media_type => 'base_distro', :noauto => 1 %> <%- |