From 3328195bec265091b335a0cc27a1829f833682c8 Mon Sep 17 00:00:00 2001 From: Stephen Gran Date: Mon, 10 Oct 2011 09:06:13 +0100 Subject: [PATCH] we now have a wheezy for buildd Signed-off-by: Stephen Gran --- .../templates/etc/apt/sources.list.d/buildd.list.erb | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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 1017d9c8..b5d686ae 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 -- 2.39.2