Merge pull request #118 from opeckojo/apt-sources-arch

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

diff --git a/manifests/source.pp b/manifests/source.pp
index 0040c14f4e9cb853b66aadf6ab5b30a15b8d52ae..713c7e933ac1f75263fdffd09c7a056eb3161538 100644 (file)
--- a/manifests/source.pp
+++ b/manifests/source.pp
@@ -4,7 +4,7 @@
 define apt::source(
   $ensure            = present,
   $location          = '',
-  $release           = $lsbdistcodename,
+  $release           = 'UNDEF',
   $repos             = 'main',
   $include_src       = true,
   $required_packages = false,
@@ -12,7 +12,8 @@ define apt::source(
   $key_server        = 'keyserver.ubuntu.com',
   $key_content       = false,
   $key_source        = false,
-  $pin               = false
+  $pin               = false,
+  $architecture      = undef
 ) {
 
   include apt::params
@@ -21,8 +22,14 @@ define apt::source(
   $sources_list_d = $apt::params::sources_list_d
   $provider       = $apt::params::provider
 
-  if $release == undef {
-    fail('lsbdistcodename fact not available: release parameter required')
+  if $release == 'UNDEF' {
+    if $::lsbdistcodename == undef {
+      fail('lsbdistcodename fact not available: release parameter required')
+    } else {
+      $release_real = $::lsbdistcodename
+    }
+  } else {
+    $release_real = $release
   }
 
   file { "${name}.list":
@@ -36,12 +43,13 @@ define apt::source(
   }
 
 
-  if ($pin != false) and ($ensure == 'present') {
+  if ($pin != false) {
     # Get the host portion out of the url so we can pin to origin
     $url_split = split($location, '/')
     $host      = $url_split[2]
 
     apt::pin { $name:
+      ensure   => $ensure,
       priority => $pin,
       before   => File["${name}.list"],
       origin   => $host,
@@ -51,8 +59,10 @@ define apt::source(
   if ($required_packages != false) and ($ensure == 'present') {
     exec { "Required packages: '${required_packages}' for ${name}":
       command     => "${provider} -y install ${required_packages}",
-      subscribe   => File["${name}.list"],
+      logoutput   => 'on_failure',
       refreshonly => true,
+      subscribe   => File["${name}.list"],
+      before      => Exec['apt_update'],
     }
   }