Merge pull request #280 from daenney/fix-pin-comments

[puppet-modules/puppetlabs-apt.git] / manifests / pin.pp

diff --git a/manifests/pin.pp b/manifests/pin.pp
index e6e293e45260db337f3b2d80f4fe2fc74f8bd4d5..2563fc468176d8c62844654a435c5f0eb7ec7de1 100644 (file)
--- a/manifests/pin.pp
+++ b/manifests/pin.pp
@@ -3,7 +3,7 @@
 
 define apt::pin(
   $ensure          = present,
-  $explanation     = "${::caller_module_name}: ${name}",
+  $explanation     = "${caller_module_name}: ${name}",
   $order           = '',
   $packages        = '*',
   $priority        = 0,
@@ -14,7 +14,7 @@ define apt::pin(
   $release_version = '', # v=
   $component       = '', # c=
   $originator      = '', # o=
-  $label           = '', # l=
+  $label           = ''  # l=
 ) {
 
   include apt::params
@@ -25,18 +25,25 @@ define apt::pin(
     fail('Only integers are allowed in the apt::pin order param')
   }
 
-  $pin_release = join([
+  $pin_release_array = [
     $release,
     $codename,
     $release_version,
     $component,
     $originator,
-    $label], '')
+    $label]
+  $pin_release = join($pin_release_array, '')
 
   # Read the manpage 'apt_preferences(5)', especially the chapter
   # 'Thea Effect of APT Preferences' to understand the following logic
   # and the difference between specific and general form
-  if $packages != '*' { # specific form
+  if is_array($packages) {
+    $packages_string = join($packages, ' ')
+  } else {
+    $packages_string = $packages
+  }
+
+  if $packages_string != '*' { # specific form
 
     if ( $pin_release != '' and ( $origin != '' or $version != '' )) or
       ( $origin != '' and ( $pin_release != '' or $version != '' )) or
@@ -61,7 +68,17 @@ define apt::pin(
     ''      => "${preferences_d}/${name}.pref",
     default => "${preferences_d}/${order}-${name}.pref",
   }
-  file { "${name}.pref":
+
+  # According to man 5 apt_preferences:
+  # The files have either no or "pref" as filename extension
+  # and only contain alphanumeric, hyphen (-), underscore (_) and period
+  # (.) characters. Otherwise APT will print a notice that it has ignored a
+  # file, unless that file matches a pattern in the
+  # Dir::Ignore-Files-Silently configuration list - in which case it will
+  # be silently ignored.
+  $file_name = regsubst($title, '[^0-9a-z\-_\.]', '_', 'IG')
+
+  file { "${file_name}.pref":
     ensure  => $ensure,
     path    => $path,
     owner   => root,