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

Merge commit 'd97a49b7b2c020c2c43df6524236f50a421789ee'.

Going on merging immerda changes.

Incompatible change: I do prefer my own generic apt/preferences template to
shipping a static file that only supports Lenny. My own template supports
security, backports, volatile, next release etc.

Conflicts:
	files/preferences
	manifests/init.pp
	manifests/preferences.pp
---

d30069c178ff2aff9154f65bd7dbf988c4d002f1
diff --cc manifests/init.pp
index f55507f,7d68303..6938c2c
--- a/manifests/init.pp
+++ b/manifests/init.pp
@@@ -69,39 -19,19 +69,33 @@@ 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)
 +
-   case $custom_sources_list {
-     '': {
-       config_file {
-         # include main, security and backports
-         # additional sources should be included via the custom_sources_template
-         # define
-         "/etc/apt/sources.list":
-           content => template( "apt/$operatingsystem/sources.list.erb"),
-           require => Package['lsb'];
-       }
-     }
-     default: {
-       config_file { "/etc/apt/sources.list":
-         content => $custom_sources_list,
-       }
-     }
+   config_file {
+     # include main, security and backports
+     # additional sources should be included via the custom_sources_template
+     # define
+     "/etc/apt/sources.list":
+       content => $custom_sources_list ? {
+         '' => template( "apt/$operatingsystem/sources.list.erb"),
+         default => $custom_sources_list
+       },
+       require => Package['lsb'];
    }
  
 -  # 01autoremove already present by default
    apt_conf_snippet{ "02show_upgraded":
      source => ["puppet:///modules/site-apt/${fqdn}/02show_upgraded",
                 "puppet:///modules/site-apt/02show_upgraded",