From: mh <mh@immerda.ch>
Date: Fri, 30 Oct 2009 21:04:48 +0000 (+0100)
Subject: switch to new lsb way
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=17be8ac18445cd2dd0db693aead10e5afc74fe19;p=puppet-apt.git

switch to new lsb way
---

diff --git a/manifests/default_sources_list.pp b/manifests/default_sources_list.pp
index 8c14b53..7db6535 100644
--- a/manifests/default_sources_list.pp
+++ b/manifests/default_sources_list.pp
@@ -1,10 +1,11 @@
 class apt::default_sources_list {
+  include lsb
   config_file {
     # include main, security and backports
     # additional sources could be included via an array
     "/etc/apt/sources.list":
       content => template("apt/sources.list.erb"),
-      require => Exec[assert_lsbdistcodename];
+      require => Package['lsb'];
   }
 }
 
diff --git a/manifests/init.pp b/manifests/init.pp
index c2dd547..eaf6bb8 100644
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@ -13,17 +13,15 @@ class apt {
 
   package { apt: ensure => installed }
 
-  # a few templates need lsbdistcodename
-  include assert_lsbdistcodename
-
   case $custom_sources_list {
     '': {
       include apt::default_sources_list
     }
     default: {
+      include lsb
       config_file { "/etc/apt/sources.list":
         content => $custom_sources_list,
-        require => Exec[assert_lsbdistcodename];
+        require => Exec['lsb'];
       }
     }
   }