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=2cab475773afcde37a4e70cdea45f48aefb938ef;hpb=771b43f706b011c65c75a35ff313a2ed324ede92;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 2cab4757..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,29 +3,22 @@
 ## USE: git clone git+ssh://$USER@puppet.debian.org/srv/puppet.debian.org/git/dsa-puppet.git
 ##
 
+<%
+  builddsuites = %w{squeeze wheezy}
+  testingunstable = 'wheezy'
+  if builddsuites.include?(lsbdistcodename)
+    suite = lsbdistcodename
+  else
+    suite = testingunstable
+  end
+%>
+
 # The buildd default repository.
-<% 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 %>
+deb https://buildd.debian.org/apt/ <%= suite %> main
 
 <% if %w{alkman porpora zandonai}.include?(hostname) -%>
-
 # Include the current test version too.
-<% 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
-<% end %>
-
+deb https://buildd.debian.org/apt/ <%= suite %>-proposed main
 <% elsif %w{krenek}.include?(hostname) -%>
-
-# The buildd bleeding edge repository.
-<% 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
-<% end %>
-
+deb https://buildd.debian.org/apt/ <%= suite %>-experimental main
 <% end %>