From: Stephen Gran <steve@lobefin.net>
Date: Mon, 10 Oct 2011 07:58:36 +0000 (+0100)
Subject: allow armhf machines to get sources.list for buildd
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c5f60da7828a73e49b98951b7bf1a67d1e17d502;p=mirror%2Fdsa-puppet.git

allow armhf machines to get sources.list for buildd

Signed-off-by: Stephen Gran <steve@lobefin.net>
---

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