From: intrigeri <intrigeri@boum.org>
Date: Wed, 6 Oct 2010 09:30:46 +0000 (+0200)
Subject: Use new variables.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e643c14ee24485b83f1d3120cf288ff14a3ae9f7;p=puppet-apt.git

Use new variables.
---

diff --git a/templates/sources.list.backports.erb b/templates/sources.list.backports.erb
index b271ca7..3be0c4e 100644
--- a/templates/sources.list.backports.erb
+++ b/templates/sources.list.backports.erb
@@ -1,8 +1,8 @@
 # This file is brought to you by puppet
 
 # backports
-<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%>
-# There are no backports for for <%= lsbdistcodename %>
+<% if (codename == "sid" || codename == "unstable") -%>
+# There are no backports for for <%= codename %>
 <% else -%>
-deb http://backports.debian.org/debian-backports/ <%= lsbdistcodename %>-backports main
+deb http://backports.debian.org/debian-backports/ <%= codename %>-backports main
 <% end -%>
diff --git a/templates/sources.list.erb b/templates/sources.list.erb
index feb5603..c3453d1 100644
--- a/templates/sources.list.erb
+++ b/templates/sources.list.erb
@@ -1,11 +1,11 @@
 # This file is brought to you by puppet
 
-# basic <%= lsbdistcodename %>
-deb http://ftp.debian.org/debian/ <%= lsbdistcodename %> main contrib non-free
+# basic <%= codename %>
+deb http://ftp.debian.org/debian/ <%= codename %> main contrib non-free
 # security suppport
-<% if (lsbdistcodename == "sid" || lsbdistcodename == "unstable") -%>
-# There is no security mirror for <%= lsbdistcodename %>
+<% if (codename == "sid" || codename == "unstable") -%>
+# There is no security mirror for <%= codename %>
 <% else -%>
-deb http://security.debian.org/ <%= lsbdistcodename %>/updates main contrib non-free
+deb http://security.debian.org/ <%= codename %>/updates main contrib non-free
 <% end -%>