From: Stephen Gran Date: Mon, 10 Oct 2011 08:06:13 +0000 (+0100) Subject: we now have a wheezy for buildd X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=3328195bec265091b335a0cc27a1829f833682c8;p=mirror%2Fdsa-puppet.git we now have a wheezy for buildd Signed-off-by: Stephen Gran --- diff --git a/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb b/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb index 1017d9c88..b5d686aed 100644 --- a/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb +++ b/modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb @@ -4,8 +4,10 @@ ## # The buildd default repository. -<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %> +<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %> deb https://buildd.debian.org/apt/ squeeze main +<% elsif nodeinfo.has_key?('wheezy') and nodeinfo['wheezy'] %> +deb https://buildd.debian.org/apt/ wheezy main <% else %> deb https://buildd.debian.org/apt/ lenny main <% end %> @@ -13,7 +15,7 @@ deb https://buildd.debian.org/apt/ lenny main <% if %w{alkman porpora zandonai}.include?(hostname) -%> # Include the current test version too. -<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %> +<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %> deb https://buildd.debian.org/apt/ squeeze-proposed main <% else %> deb https://buildd.debian.org/apt/ lenny-proposed main @@ -22,7 +24,7 @@ deb https://buildd.debian.org/apt/ lenny-proposed main <% elsif %w{krenek}.include?(hostname) -%> # The buildd bleeding edge repository. -<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %> +<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %> deb https://buildd.debian.org/apt/ squeeze-experimental main <% else %> deb https://buildd.debian.org/apt/ lenny-experimental main