aboutsummaryrefslogtreecommitdiffstats
path: root/modules/buildsystem/manifests/create_upload_dir.rb
diff options
context:
space:
mode:
authorNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:23 +0000
committerNicolas Vigier <boklm@mageia.org>2013-05-23 15:05:23 +0000
commite14cedea84900b8de3e16dcb96abbd27d590085b (patch)
tree94a3970c54d8693d7c32198b72bb120c08af532a /modules/buildsystem/manifests/create_upload_dir.rb
parentf354bdaf4612d737a5243b9cc93f0fe9e6fc492c (diff)
downloadpuppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar.gz
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar.bz2
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.tar.xz
puppet-e14cedea84900b8de3e16dcb96abbd27d590085b.zip
buildsystem::var::distros: change $distros structure
The $distros variable is hash containing settings about the distributions. It was something like this : $distro = { 'cauldron' => { 'arch' => [ 'i586', 'x86_64' ], 'medias' => { 'core' => [ 'release' ], }, 'base_medias' => [ 'core/release' ], }, } It is now something like this : $distro = { 'cauldron' => { 'arch' => [ 'i586', 'x86_64' ], 'medias' => { 'core' => { 'repos' => { 'release' => {}, }, }, }, 'base_medias' => [ 'core/release' ], }, } This should allow setting more infos about each medias / repos, that can be used in order to generate media.cfg config files.
Diffstat (limited to 'modules/buildsystem/manifests/create_upload_dir.rb')
-rw-r--r--modules/buildsystem/manifests/create_upload_dir.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/buildsystem/manifests/create_upload_dir.rb b/modules/buildsystem/manifests/create_upload_dir.rb
index f3e16a3e..c95c9b10 100644
--- a/modules/buildsystem/manifests/create_upload_dir.rb
+++ b/modules/buildsystem/manifests/create_upload_dir.rb
@@ -14,10 +14,10 @@ hostclass "buildsystem::create_upload_dir" do
scope.lookupvar('buildsystem::var::distros::distros').each{|rel, distro|
file [uploads_dir, st, rel].join('/'), :ensure => 'directory', :owner => owner, :group => group
medias = distro['medias']
- medias.each{|media, repos|
+ medias.each{|media, m|
file [uploads_dir, st, rel, media].join('/'), :ensure => 'directory', :owner => owner, :group => group
- for repo in repos do
+ for repo in m['repos'].keys do
if st == 'done'
file [uploads_dir, st, rel, media, repo].join('/'), :ensure => 'directory', :owner => owner, :group => group, :mode => 0775
else