change $listchanges_* to $apt_listchanges, not nice to clutter up the namespace like...

diff --git a/manifests/listchanges.pp b/manifests/listchanges.pp
index 347717ed0c4180b2e1e71d878c343b6942e1dbca..04cbc523f8d0110a9d89476b3057f94e8dbd4fe1 100644 (file)
--- a/manifests/listchanges.pp
+++ b/manifests/listchanges.pp
@@ -1,37 +1,37 @@
 class apt::listchanges {
 
-  case $listchanges_version {
+  case $apt_listchanges_version {
     '': { $listchanges_version = "present" }
   }
 
-  case $listchanges_config {
+  case $apt_listchanges_config {
     '': { $listchanges_config = "apt/${operatingsystem}/listchanges_${lsbdistcodename}.erb" }
   }
 
-  case $listchanges_frontend {
+  case $apt_listchanges_frontend {
     '': { $listchanges_frontend = "mail" }
   }
 
-  case $listchanges_email {
+  case $apt_listchanges_email {
     '': { $listchanges_email = "root" }
   }
 
-  case $listchanges_confirm {
+  case $apt_listchanges_confirm {
     '': { $listchanges_confirm = "0" }
   }
 
-  case $listchanges_saveseen {
+  case $apt_listchanges_saveseen {
     '': { $listchanges_saveseen = "/var/lib/apt/listchanges.db" }
   }
 
-  case $listchanges_which {
+  case $apt_listchanges_which {
     '': { $listchanges_which = "both" }
   }
 
-  package { apt-listchanges: ensure => $listchanges_ensure_version }
+  package { apt-listchanges: ensure => $apt_listchanges_ensure_version }
   
   file { "/etc/apt/listchanges.conf":
-    content => template($listchanges_config),
+    content => template($apt_listchanges_config),
     mode => 0644, owner => root, group => root,
     require => Package["apt-listchanges"];
   }

diff --git a/templates/Debian/listchanges_lenny.erb b/templates/Debian/listchanges_lenny.erb
index fec3b68fb3bfad1702d842ae9fdec0af6b201e2f..3624b39efd8bee5cd526c4fbb8a8bd6d89a5bb79 100644 (file)
--- a/templates/Debian/listchanges_lenny.erb
+++ b/templates/Debian/listchanges_lenny.erb
@@ -1,7 +1,7 @@
 [apt]
-frontend=<%= listchanges_frontend %>
-email_address=<%= listchanges_email %>
-confirm=<%= listchanges_confirm %>
-save_seen=<%= listchanges_saveseen %>
-which=<%= listchanges_which %>
+frontend=<%= apt_listchanges_frontend %>
+email_address=<%= apt_listchanges_email %>
+confirm=<%= apt_listchanges_confirm %>
+save_seen=<%= apt_listchanges_saveseen %>
+which=<%= apt_listchanges_which %>