X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=modules%2Fbuildd%2Ftemplates%2Fetc%2Fapt%2Fsources.list.d%2Fbuildd.list.erb;h=8ffb4c6f379bdefae4ec01515e5d69052b61bd5c;hb=103e56b48752f77fd66edd1824d82946570ca033;hp=b1d9be4d9269fee6638b8b2a04997bbde302b694;hpb=1c6cc6f7824f43f1605b24e3748392c125768ce5;p=dsa-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 b1d9be4d..8ffb4c6f 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
@@ -3,14 +3,22 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
-<% if nodeinfo.has_key?('squeeze') and nodeinfo['squeeze'] %>
-deb https://buildd.debian.org/apt/ squeeze main
-<% else %>
-deb https://buildd.debian.org/apt/ lenny main
-<% end %>
+<%
+  builddsuites = %w{squeeze wheezy}
+  testingunstable = 'wheezy'
+  if builddsuites.include?(lsbdistcodename)
+    suite = lsbdistcodename
+  else
+    suite = testingunstable
+  end
+%>
+
+# The buildd default repository.
+deb https://buildd.debian.org/apt/ <%= suite %> main
 
 <% if %w{alkman porpora zandonai}.include?(hostname) -%>
-deb https://buildd.debian.org/apt/ lenny-proposed main
+# Include the current test version too.
+deb https://buildd.debian.org/apt/ <%= suite %>-proposed main
 <% elsif %w{krenek}.include?(hostname) -%>
-deb https://buildd.debian.org/apt/ lenny-experimental main
+deb https://buildd.debian.org/apt/ <%= suite %>-experimental main
 <% end %>