From: intrigeri <intrigeri@boum.org>
Date: Sun, 21 Nov 2010 15:41:56 +0000 (+0100)
Subject: Merge commit '27d5808299045ebd6f428e7d8131d11d9ab37712'.
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=f22861e820dc2c7f638561a2704dff19810daa66;p=puppet-apt.git

Merge commit '27d5808299045ebd6f428e7d8131d11d9ab37712'.

One more painless merge commit.

Conflicts:
	manifests/init.pp
---

f22861e820dc2c7f638561a2704dff19810daa66
diff --cc manifests/init.pp
index 6938c2c,695c193..28fea99
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -69,25 -17,9 +67,24 @@@ class apt 
    }
  
    include lsb
 +
 +  # init $release, $next_release, $codename, $next_codename
 +  case $lsbdistcodename {
 +    '': {
 +      $codename = $lsbdistcodename
 +      $release = $lsbdistrelease
 +    }
 +    default: {
 +      $codename = $lsbdistcodename
 +      $release = debian_release($codename)
 +    }
 +  }
 +  $next_codename = debian_nextcodename($codename)
 +  $next_release = debian_nextrelease($release)
 +
    config_file {
      # include main, security and backports
-     # additional sources should be included via the custom_sources_template
-     # define
+     # additional sources should be included via the apt::sources_list define
      "/etc/apt/sources.list":
        content => $custom_sources_list ? {
          '' => template( "apt/$operatingsystem/sources.list.erb"),
@@@ -96,7 -28,8 +93,7 @@@
        require => Package['lsb'];
    }
  
-   apt_conf_snippet{ "02show_upgraded":
 -  # 01autoremove already present by default
+   apt_conf { "02show_upgraded":
      source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded",
                 "puppet:///modules/site-apt/02show_upgraded",
                 "puppet:///modules/apt/02show_upgraded"]