diff options
Diffstat (limited to 'modules/buildsystem/templates/mgarepo.conf')
| -rw-r--r-- | modules/buildsystem/templates/mgarepo.conf | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/modules/buildsystem/templates/mgarepo.conf b/modules/buildsystem/templates/mgarepo.conf index d92c6cd1..cecec703 100644 --- a/modules/buildsystem/templates/mgarepo.conf +++ b/modules/buildsystem/templates/mgarepo.conf @@ -11,7 +11,8 @@ trunk-dir = <%= default_distro %> <%- conf = scope.lookupvar('buildsystem::var::mgarepo::conf') if conf['global'] != nil - conf['global'].each{|key,value| + conf['global'].keys.sort.each{|key| + value = conf['global'][key] -%><%= key %> = <%= value %> <%- } @@ -39,7 +40,8 @@ default = <%= default_distro %> host = <%= scope.lookupvar('buildsystem::var::mgarepo::submit_host') %> <%- - distros.each{|d, distro| + distros.keys.sort.each{|d| + distro = distros[d] -%> [submit <%= d %>] target = <%= sched_home_dir %>/repsys/srpms @@ -55,12 +57,14 @@ rpm-macros = global <%= d %> mkrel(c:) = %{-c: 0.%{-c*}.}%{1}%{?subrel:.%subrel}%{?distsuffix:%distsuffix}%{?!distsuffix:.mga}%{?distro_release:%distro_release} <%- - distros.each{|d, distro| + distros.keys.sort.each{|d| + distro = distros[d] -%> [macros <%= d %>] distro_release = <%= distro['version'] %> <%- - distro['macros'].each{|macro, value| + distro['macros'].keys.sort.each{|macro| + value = distro['macros'][macro] -%><%= macro %> = <%= value %> <%- } %> <%- } |