X-Git-Url: https://git.adam-barratt.org.uk/?a=blobdiff_plain;f=modules%2Fbuildd%2Ftemplates%2Fetc%2Fapt%2Fsources.list.d%2Fbuildd.list.erb;h=1017d9c88842c61d95d66e329620ea913db30fe6;hb=c5f60da7828a73e49b98951b7bf1a67d1e17d502;hp=2cab475773afcde37a4e70cdea45f48aefb938ef;hpb=3d68a67a4ea96ded0173f54a38430c27b19f3f34;p=mirror%2Fdsa-puppet.git

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 2cab47577..1017d9c88 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,7 +4,7 @@
 ##
 
 # The buildd default repository.
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 deb https://buildd.debian.org/apt/ squeeze main
 <% else %>
 deb https://buildd.debian.org/apt/ lenny main
@@ -13,7 +13,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'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 deb https://buildd.debian.org/apt/ squeeze-proposed main
 <% else %>
 deb https://buildd.debian.org/apt/ lenny-proposed main
@@ -22,7 +22,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'] %>
+<% if (nodeinfo.has_key?('squeeze') and nodeinfo['squeeze']) or (nodeinfo.has_key?('wheezy') and nodeinfo['wheezy']) %>
 deb https://buildd.debian.org/apt/ squeeze-experimental main
 <% else %>
 deb https://buildd.debian.org/apt/ lenny-experimental main