From af616677e6558d1ad2bfdcdf02dc318bec192363 Mon Sep 17 00:00:00 2001
From: mh <mh@immerda.ch>
Date: Fri, 18 Apr 2014 10:59:26 +0200
Subject: address puppet 3.x deprecation warnings

---
 templates/Debian/sources.list.erb | 56 +++++++++++++++++++--------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'templates/Debian/sources.list.erb')

diff --git a/templates/Debian/sources.list.erb b/templates/Debian/sources.list.erb
index 65b5945..dee6ce5 100644
--- a/templates/Debian/sources.list.erb
+++ b/templates/Debian/sources.list.erb
@@ -5,7 +5,7 @@
 
 # basic
 deb <%= debian_url=scope.lookupvar('apt::debian_url') %> <%= codename %> <%= lrepos=scope.lookupvar('apt::real_repos') %>
-<% if scope.lookupvar('apt::include_src')  -%>
+<% if include_src=scope.lookupvar('apt::include_src')  -%>
 deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 <% end -%>
 
@@ -14,61 +14,61 @@ deb-src <%= debian_url %> <%= codename %> <%= lrepos %>
 # There is no security support for <%= release %>
 <% else -%>
 deb <%= security_url=scope.lookupvar('apt::security_url') %> <%= codename %>/updates <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= security_url %> <%= codename %>/updates <%= lrepos %>
-<% end -%>
-<% end -%>
+<%   end
+   end -%>
 
 # backports
 <% if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no backports archive for <%= release %>
 <% else -%>
 deb <%= backports_url=scope.lookupvar('apt::backports_url') %> <%= codename %>-backports <%= lrepos %>
-<% if include_src -%>
+<%   if include_src -%>
 deb-src <%= backports_url %> <%= codename %>-backports <%= lrepos %>
-<% end -%>
-<% end -%>
+<%   end
+   end -%>
 
 <% if use_volatile=scope.lookupvar('apt::use_volatile') -%>
 # volatile
-<% if (release == "testing" || release == "unstable" || release == "experimental") -%>
+<%   if (release == "testing" || release == "unstable" || release == "experimental") -%>
 # There is no volatile archive for <%= release %>
-<% else -%>
+<%   else -%>
 deb <%= debian_url %> <%= codename %>-updates <%= lrepos %>
-<% if include_src -%>
+<%     if include_src -%>
 deb-src <%= debian_url %> <%= codename %>-updates <%= lrepos %>
-<% end -%>
-<% end -%>
-<% end -%>
+<%     end
+     end
+   end -%>
 
 <% if next_release=scope.lookupvar('apt::use_next_release') -%>
 ### Debian next: <%= next_release=scope.lookupvar('apt::next_release') ; next_codename=scope.lookupvar('apt::next_codename') %>
 
 # basic
 deb <%= debian_url %> <%= next_codename %> <%= lrepos %>
-<% if include_src then -%>
+<%   if include_src -%>
 deb-src <%= debian_url %> <%= next_codename %> <%= lrepos %>
-<% end -%>
+<%   end -%>
 
 # security
-<% if (next_release == "unstable" || next_release == "experimental") -%>
+<%   if (next_release == "unstable" || next_release == "experimental") -%>
 # There is no security support for <%= next_release %>
-<% else -%>
+<%   else -%>
 deb <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
-<% if include_src then -%>
+<%     if include_src then -%>
 deb-src <%= security_url %> <%= next_codename %>/updates <%= lrepos %>
-<% end -%>
-<% end -%>
+<%     end
+     end -%>
 
-<% if use_volatile -%>
+<%   if use_volatile -%>
 # volatile
-<% if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
+<%     if (next_release == "testing" || next_release == "unstable" || next_release == "experimental") -%>
 # There is no volatile archive for <%= next_release %>
-<% else -%>
+<%     else -%>
 deb <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
-<% if include_src then -%>
+<%       if include_src -%>
 deb-src <%= debian_url %> <%= next_codename %>-updates <%= lrepos %>
-<% end -%>
-<% end -%>
-<% end -%>
-<% end -%>
+<%       end
+       end
+     end
+   end -%>
-- 
cgit v1.2.3