]> git.donarmstrong.com Git - dsa-puppet.git/commitdiff
allow armhf machines to get sources.list for buildd
authorStephen Gran <steve@lobefin.net>
Mon, 10 Oct 2011 07:58:36 +0000 (08:58 +0100)
committerStephen Gran <steve@lobefin.net>
Mon, 10 Oct 2011 07:58:36 +0000 (08:58 +0100)
Signed-off-by: Stephen Gran <steve@lobefin.net>
modules/buildd/templates/etc/apt/sources.list.d/buildd.list.erb

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