]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
we now have a wheezy for buildd
authorStephen Gran <steve@lobefin.net>
Mon, 10 Oct 2011 08:06:13 +0000 (09:06 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 10 Oct 2011 08:06:13 +0000 (09:06 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb

index 1017d9c88842c61d95d66e329620ea913db30fe6..b5d686aedf34e772e569b38382fbd40058ec6eeb 100644 (file)
@@ -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