aboutsummaryrefslogtreecommitdiffstats
path: root/deployment
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-29 22:05:25 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-29 22:05:25 +0000
commitf28bf7c0ee4036d8ac77ea67e0878b0463dc316d (patch)
tree860ada7c1c0e17bf29971d167578752164367cf8 /deployment
parent630824f1137eec2b42291952ad00739239a17121 (diff)
downloadpuppet-f28bf7c0ee4036d8ac77ea67e0878b0463dc316d.tar
puppet-f28bf7c0ee4036d8ac77ea67e0878b0463dc316d.tar.gz
puppet-f28bf7c0ee4036d8ac77ea67e0878b0463dc316d.tar.bz2
puppet-f28bf7c0ee4036d8ac77ea67e0878b0463dc316d.tar.xz
puppet-f28bf7c0ee4036d8ac77ea67e0878b0463dc316d.zip
Fix medias order in media.cfg
Diffstat (limited to 'deployment')
-rw-r--r--deployment/mga_buildsystem/manifests/config.pp28
1 files changed, 19 insertions, 9 deletions
diff --git a/deployment/mga_buildsystem/manifests/config.pp b/deployment/mga_buildsystem/manifests/config.pp
index 8cc68578..2dcc1566 100644
--- a/deployment/mga_buildsystem/manifests/config.pp
+++ b/deployment/mga_buildsystem/manifests/config.pp
@@ -59,44 +59,52 @@ class mga_buildsystem::config {
'release' => {
'media_type' => [ 'release' ],
'requires' => [],
+ 'order' => 0,
+ },
+ 'updates' => {
+ 'media_type' => [ 'updates' ],
+ 'updates_for' => 'release',
+ 'requires' => [ 'release' ],
+ 'order' => 1,
},
'updates_testing' => {
'media_type' => [ 'testing' ],
'noauto' => '1',
'requires' => [ 'updates' ],
- },
- 'backports_testing' => {
- 'media_type' => [ 'testing' ],
- 'noauto' => '1',
- 'requires' => [ 'backports' ],
+ 'order' => 2,
},
'backports' => {
'media_type' => [ 'backports' ],
'noauto' => '1',
'requires' => [ 'updates' ],
+ 'order' => 3,
},
- 'updates' => {
- 'media_type' => [ 'updates' ],
- 'updates_for' => 'release',
- 'requires' => [ 'release' ],
+ 'backports_testing' => {
+ 'media_type' => [ 'testing' ],
+ 'noauto' => '1',
+ 'requires' => [ 'backports' ],
+ 'order' => 4,
},
}
$std_medias = {
'core' => {
'repos' => $std_repos,
'media_type' => [ 'official', 'free' ],
+ 'order' => 0,
},
'nonfree' => {
'repos' => $std_repos,
'media_type' => [ 'official' ],
'noauto' => '1',
'requires' => [ 'core' ],
+ 'order' => 1,
},
'tainted' => {
'repos' => $std_repos,
'media_type' => [ 'official' ],
'noauto' => '1',
'requires' => [ 'core' ],
+ 'order' => 2,
},
}
$std_base_media = [ 'core/release', 'core/updates' ]
@@ -106,10 +114,12 @@ class mga_buildsystem::config {
'updates' => {
'media_type' => [ 'updates' ],
'requires' => [ 'release' ],
+ 'order' => 0,
},
},
'media_type' => [ 'infra' ],
'requires' => [ 'core' ],
+ 'order' => 0,
},
}
$std_macros = {