Merge pull request #508 from puppetlabs/travis-puppet4

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

diff --git a/manifests/pin.pp b/manifests/pin.pp
index 214fa997e8d9a2c112b883c8abf6605dd58eab07..bcccf28b7c8058532e30827c172a58f0f171bc1b 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     = undef,
   $order           = undef,
   $packages        = '*',
   $priority        = 0,
@@ -20,6 +20,16 @@ define apt::pin(
     fail('Only integers are allowed in the apt::pin order param')
   }
 
+  if $explanation {
+    $_explanation = $explanation
+  } else {
+    if defined('$caller_module_name') { # strict vars check
+      $_explanation = "${caller_module_name}: ${name}"
+    } else {
+      $_explanation = ": ${name}"
+    }
+  }
+
   $pin_release_array = [
     $release,
     $codename,
@@ -62,10 +72,8 @@ define apt::pin(
   $file_name = regsubst($title, '[^0-9a-z\-_\.]', '_', 'IG')
 
   apt::setting { "pref-${file_name}":
-    ensure       => $ensure,
-    base_name    => $file_name,
-    setting_type => 'pref',
-    priority     => $order,
-    content      => template('apt/_header.erb', 'apt/pin.pref.erb'),
+    ensure   => $ensure,
+    priority => $order,
+    content  => template('apt/_header.erb', 'apt/pin.pref.erb'),
   }
 }