diff options
Diffstat (limited to 'modules/buildsystem')
| -rw-r--r-- | modules/buildsystem/manifests/var/distros.pp | 10 | ||||
| -rw-r--r-- | modules/buildsystem/templates/media.cfg | 4 |
2 files changed, 11 insertions, 3 deletions
diff --git a/modules/buildsystem/manifests/var/distros.pp b/modules/buildsystem/manifests/var/distros.pp index 4d884de9..e1079e40 100644 --- a/modules/buildsystem/manifests/var/distros.pp +++ b/modules/buildsystem/manifests/var/distros.pp @@ -17,13 +17,17 @@ # 'release' => { # 'media_type' => [ 'release' ], # 'noauto' => '1', +# # the 'release' repo should be listed first in media.cfg +# 'order' => 0, # }, # # the 'updates' repo -# 'release' => { +# 'updates' => { # 'media_type' => [ 'updates' ], # 'noauto' => '1', # # the 'updates' repo requires the 'release' repo # 'requires' => [ 'release' ], +# # the 'updates' repo should be listed after 'release' in media.cfg +# 'order' => 1, # }, # }, # # media_type for media.cfg @@ -31,6 +35,8 @@ # # if noauto is set to '1' either in medias or repos, # # the option will be added to media.cfg # 'noauto' => '1', +# # list 'core' first in media.cfg +# 'order' => 0, # }, # # the 'non-free' media # 'non-free' => { @@ -40,6 +46,8 @@ # 'media_type' => [ 'official', 'non-free' ], # # the 'non-free' media requires the 'core' media # 'requires' => [ 'core' ], +# # list 'non-free' second +# 'order' => 1, # } # }, # # the list of media used by iurt to build the chroots diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg index fb4e0680..203e5ebf 100644 --- a/modules/buildsystem/templates/media.cfg +++ b/modules/buildsystem/templates/media.cfg @@ -33,9 +33,9 @@ arch=<%= @arch %> xml-info=1 <%- -distro['medias'].keys.sort.each{|medianame| +distro['medias'].keys.sort { |x,y| distro['medias'][x]['order'] <=> distro['medias'][y]['order'] }.each{|medianame| media = distro['medias'][medianame] - media['repos'].keys.sort.each{|reponame| + media['repos'].keys.sort { |x,y| media['repos'][x]['order'] <=> media['repos'][y]['order'] }.each{|reponame| repo = media['repos'][reponame] media_type = [] if media['media_type'] != nil |