From 870daca3906576f795d3cbbf54ecd5ca49c91336 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm@mageia.org>
Date: Wed, 29 May 2013 20:44:29 +0000
Subject: buildsystem: media_types -> media_type (bug #10335)

---
 modules/buildsystem/templates/media.cfg | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'modules/buildsystem/templates')

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
 		%>
 		<%-
-- 
cgit v1.2.1